Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update wasmer-toml version #3494

Merged
merged 4 commits into from
Jan 19, 2023
Merged
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion lib/cli/Cargo.toml
Original file line number Diff line number Diff line change
@@ -63,7 +63,8 @@ dirs = { version = "4.0" }
serde_json = { version = "1.0" }
target-lexicon = { version = "0.12", features = ["std"] }
prettytable-rs = "0.9.0"
wasmer-toml = "0.5.0"
wasmer-toml = "0.6.0"
indexmap = "1.9.2"
walkdir = "2.3.2"
regex = "1.6.0"
toml = "0.5.9"
3 changes: 2 additions & 1 deletion lib/cli/src/commands/init.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
use anyhow::Context;
use cargo_metadata::{CargoOpt, MetadataCommand};
use clap::Parser;
use indexmap::IndexMap;
use std::collections::HashMap;
use std::path::Path;
use std::path::PathBuf;
@@ -204,7 +205,7 @@ impl Init {
}
}

fn get_filesystem_mapping(include: &[String]) -> Option<HashMap<String, PathBuf>> {
fn get_filesystem_mapping(include: &[String]) -> Option<IndexMap<String, PathBuf>> {
if include.is_empty() {
return None;
}
2 changes: 1 addition & 1 deletion lib/cli/src/commands/publish.rs
Original file line number Diff line number Diff line change
@@ -215,7 +215,7 @@ fn construct_tar_gz(
}

// bundle the package filesystem
let default = std::collections::HashMap::default();
let default = indexmap::IndexMap::default();
for (_alias, path) in manifest.fs.as_ref().unwrap_or(&default).iter() {
let normalized_path = normalize_path(cwd, path);
let path_metadata = normalized_path.metadata().map_err(|_| {
3 changes: 1 addition & 2 deletions lib/cli/src/commands/run.rs
Original file line number Diff line number Diff line change
@@ -7,7 +7,6 @@ use crate::suggestions::suggest_function_exports;
use crate::warning;
use anyhow::{anyhow, Context, Result};
use clap::Parser;
use std::collections::HashMap;
use std::ops::Deref;
use std::path::PathBuf;
use std::str::FromStr;
@@ -121,7 +120,7 @@ impl RunWithPathBuf {

#[cfg(feature = "wasi")]
{
let default = HashMap::default();
let default = indexmap::IndexMap::default();
theduke marked this conversation as resolved.
Show resolved Hide resolved
let fs = manifest.fs.as_ref().unwrap_or(&default);
for (alias, real_dir) in fs.iter() {
let real_dir = self_clone.path.join(&real_dir);
2 changes: 1 addition & 1 deletion lib/registry/Cargo.toml
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@ serde_json = "1.0.85"
url = "2.3.1"
thiserror = "1.0.37"
toml = "0.5.9"
wasmer-toml = "0.5.0"
wasmer-toml = "0.6.0"
tar = "0.4.38"
flate2 = "1.0.24"
semver = "1.0.14"