mii/wasmer
1
0
Fork 0
mirror of https://github.com/mii443/wasmer.git synced 2025-12-07 13:18:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

cargo fmt

Browse Source
This commit is contained in:
Felix Schütt
2022-10-07 13:44:08 +02:00
parent a6d9e3e63a
commit 7edfd68759
6 changed files with 75 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/cli/src/cli.rs
View File

@@ -260,8 +260,9 @@ fn parse_cli_args() -> Result<(), anyhow::Error> {
&package.registry,
&package.name,
&package.version,
).map_err(|e| anyhow!("{e}"))?;
)
.map_err(|e| anyhow!("{e}"))?;
// Try finding the local package
let mut args_without_package = args.clone();
args_without_package.remove(1);

33
lib/cli/src/commands/run.rs
View File

@@ -76,18 +76,21 @@ pub struct RunWithoutFile {
impl RunWithoutFile {
/// Given a local path, returns the `Run` command (overriding the `--path` argument).
pub fn into_run_args(mut self, pathbuf: PathBuf, manifest: Option<wapm_toml::Manifest>) -> Run {
#[cfg(feature = "wasi")] {
#[cfg(feature = "wasi")]
{
let pkg_fs = match pathbuf.parent() {
Some(parent) => parent.join("pkg_fs"),
None => pathbuf.join("pkg_fs"),
};
if let Some(mut m) = manifest.as_ref().and_then(|m| m.package.pkg_fs_mount_point.clone()) {
if let Some(mut m) = manifest
.as_ref()
.and_then(|m| m.package.pkg_fs_mount_point.clone())
{
if m == "." {
self.wasi.map_dir("/", pkg_fs);
} else {
if m.starts_with(".") {
m = format!("{}{}", pkg_fs.display(), &m[1..]);
if m.starts_with(".") {
m = format!("{}{}", pkg_fs.display(), &m[1..]);
}
let path = std::path::Path::new(&m).to_path_buf();
self.wasi.map_dir("/", path);
@@ -108,7 +111,10 @@ impl RunWithoutFile {
pathbuf.join(real_dir)
};
if !real_dir.exists() {
println!("warning: cannot map {alias:?} to {}: directory does not exist", real_dir.display());
println!(
"warning: cannot map {alias:?} to {}: directory does not exist",
real_dir.display()
);
continue;
}
let alias_pathbuf = std::path::Path::new(&real_dir).to_path_buf();
@@ -123,11 +129,16 @@ impl RunWithoutFile {
}
let root_display = format!("{}", alias_pathbuf.display());
for entry in walkdir::WalkDir::new(&alias_pathbuf).into_iter().filter_entry(|e| is_dir(e)).filter_map(|e| e.ok()) {
for entry in walkdir::WalkDir::new(&alias_pathbuf)
.into_iter()
.filter_entry(|e| is_dir(e))
.filter_map(|e| e.ok())
{
let pathbuf = entry.path().canonicalize().unwrap();
let path = format!("{}", pathbuf.display());
let relativepath = path.replacen(&root_display, "", 1);
self.wasi.map_dir(&format!("/{alias}{relativepath}"), pathbuf);
self.wasi
.map_dir(&format!("/{alias}{relativepath}"), pathbuf);
}
}
}
@@ -279,8 +290,10 @@ impl Run {
let env = FunctionEnv::new(&mut store, em_env);
let mut emscripten_globals = EmscriptenGlobals::new(&mut store, &env, &module)
.map_err(|e| anyhow!("{}", e))?;
env.as_mut(&mut store)
.set_data(&emscripten_globals.data, self.wasi.mapped_dirs.clone().into_iter().collect());
env.as_mut(&mut store).set_data(
&emscripten_globals.data,
self.wasi.mapped_dirs.clone().into_iter().collect(),
);
let import_object =
generate_emscripten_env(&mut store, &env, &mut emscripten_globals);
let mut instance = match Instance::new(&mut store, &module, &import_object) {

4
lib/cli/src/commands/run/wasi.rs
View File

@@ -52,10 +52,10 @@ pub struct Wasi {
#[allow(dead_code)]
impl Wasi {
pub fn map_dir(&mut self, alias: &str, target_on_disk: PathBuf) {
self.mapped_dirs.push((alias.to_string(), target_on_disk));
self.pre_opened_directories.push(std::path::Path::new(alias).to_path_buf());
self.pre_opened_directories
.push(std::path::Path::new(alias).to_path_buf());
}
pub fn set_env(&mut self, key: &str, value: &str) {