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

Fix clippy issues

Browse Source
This commit is contained in:
Felix Schütt
2022-10-09 23:37:28 +02:00
parent 5b16e058a2
commit 0ed3be1d1b
2 changed files with 24 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -199,15 +199,15 @@ fn parse_cli_args() -> Result<(), anyhow::Error> {
args_without_first_and_second_arg.remove(0); args_without_first_and_second_arg.remove(0);
match (firstarg, secondarg) { match (firstarg, secondarg) {
(None, _) | (Some("help"), _) | (Some("--help"), _) => return print_help(true), (None, _) | (Some("help"), _) | (Some("--help"), _) => print_help(true),
(Some("-h"), _) => return print_help(false), (Some("-h"), _) => print_help(false),
(Some("-vV"), _) (Some("-vV"), _)
| (Some("version"), Some("--verbose")) | (Some("version"), Some("--verbose"))
| (Some("--version"), Some("--verbose")) => return print_version(true), | (Some("--version"), Some("--verbose")) => print_version(true),
(Some("-v"), _) | (Some("-V"), _) | (Some("version"), _) | (Some("--version"), _) => { (Some("-v"), _) | (Some("-V"), _) | (Some("version"), _) | (Some("--version"), _) => {
return print_version(false) print_version(false)
} }
(Some("list"), _) => { (Some("list"), _) => {
use prettytable::{format, row, Table}; use prettytable::{format, row, Table};
@@ -224,12 +224,7 @@ fn parse_cli_args() -> Result<(), anyhow::Error> {
.collect::<Vec<_>>() .collect::<Vec<_>>()
.join(" \r\n"); .join(" \r\n");
row![ row![pkg.registry, pkg.name, pkg.version, commands]
pkg.registry.clone(),
pkg.name.clone(),
pkg.version.clone(),
commands
]
}) })
.collect::<Vec<_>>(); .collect::<Vec<_>>();
@@ -238,7 +233,7 @@ fn parse_cli_args() -> Result<(), anyhow::Error> {
println!("--------------------------------------"); println!("--------------------------------------");
println!("Registry Package Version Commands "); println!("Registry Package Version Commands ");
println!("======================================"); println!("======================================");
println!(""); println!();
} else { } else {
let mut table = Table::init(rows); let mut table = Table::init(rows);
table.set_titles(row!["Registry", "Package", "Version", "Commands"]); table.set_titles(row!["Registry", "Package", "Version", "Commands"]);
@@ -250,7 +245,7 @@ fn parse_cli_args() -> Result<(), anyhow::Error> {
Ok(()) Ok(())
} }
(Some("run"), Some(package)) | (Some(package), _) => { (Some("run"), Some(package)) | (Some(package), _) => {
if package.starts_with("-") { if package.starts_with('-') {
return Err(anyhow!("Unknown CLI argument {package:?}")); return Err(anyhow!("Unknown CLI argument {package:?}"));
} }
@@ -261,12 +256,11 @@ fn parse_cli_args() -> Result<(), anyhow::Error> {
std::panic::set_hook(hook); std::panic::set_hook(hook);
if let Ok(Ok(run)) = result { if let Ok(Ok(run)) = result {
return run.execute(); run.execute()
} else if let Ok((package, version)) = split_version(package) { } else if let Ok((package, version)) = split_version(package) {
if let Some(package) = wasmer_registry::get_local_package( if let Some(package) =
&package, wasmer_registry::get_local_package(&package, version.as_deref())
version.as_ref().map(|s| s.as_str()), {
) {
let local_package_wasm_path = wasmer_registry::get_package_local_wasm_file( let local_package_wasm_path = wasmer_registry::get_package_local_wasm_file(
&package.registry, &package.registry,
&package.name, &package.name,
@@ -278,7 +272,7 @@ fn parse_cli_args() -> Result<(), anyhow::Error> {
let mut args_without_package = args.clone(); let mut args_without_package = args.clone();
args_without_package.remove(1); args_without_package.remove(1);
return RunWithoutFile::try_parse_from(args_without_package.iter())? return RunWithoutFile::try_parse_from(args_without_package.iter())?
.into_run_args(local_package_wasm_path, Some(package.manifest.clone())) .into_run_args(local_package_wasm_path, Some(package.manifest))
.execute(); .execute();
} }
@@ -290,7 +284,7 @@ fn parse_cli_args() -> Result<(), anyhow::Error> {
]) ])
.start(); .start();
let v = version.as_ref().map(|s| s.as_str()); let v = version.as_deref();
let result = wasmer_registry::install_package(&package, v); let result = wasmer_registry::install_package(&package, v);
sp.close(); sp.close();
print!("\r\n"); print!("\r\n");
@@ -300,16 +294,16 @@ fn parse_cli_args() -> Result<(), anyhow::Error> {
let mut args_without_package = args.clone(); let mut args_without_package = args.clone();
args_without_package.remove(1); args_without_package.remove(1);
return RunWithoutFile::try_parse_from(args_without_package.iter())? return RunWithoutFile::try_parse_from(args_without_package.iter())?
.into_run_args(buf, Some(package.manifest.clone())) .into_run_args(buf, Some(package.manifest))
.execute(); .execute();
} }
Err(e) => { Err(e) => {
println!("{e}"); println!("{e}");
return Ok(()); Ok(())
} }
} }
} else { } else {
return WasmerCLIOptions::try_parse()?.execute(); WasmerCLIOptions::try_parse()?.execute()
/* /*
let hook = std::panic::take_hook(); let hook = std::panic::take_hook();
std::panic::set_hook(Box::new(|_| {})); std::panic::set_hook(Box::new(|_| {}));
@@ -346,10 +340,10 @@ fn split_version(s: &str) -> Result<(String, Option<String>), anyhow::Error> {
if prohibited_package_names.contains(&s.trim()) { if prohibited_package_names.contains(&s.trim()) {
return Err(anyhow::anyhow!("Invalid package name {s:?}")); return Err(anyhow::anyhow!("Invalid package name {s:?}"));
} }
let package_version = s.split("@").collect::<Vec<_>>(); let package_version = s.split('@').collect::<Vec<_>>();
match package_version.as_slice() { match *package_version.as_slice() {
&[p, v] => Ok((p.trim().to_string(), Some(v.trim().to_string()))), [p, v] => Ok((p.trim().to_string(), Some(v.trim().to_string()))),
&[p] => Ok((p.trim().to_string(), None)), [p] => Ok((p.trim().to_string(), None)),
_ => Err(anyhow!("Invalid package / version: {s:?}")), _ => Err(anyhow!("Invalid package / version: {s:?}")),
} }
} }
@@ -365,6 +359,7 @@ fn print_help(verbose: bool) -> Result<(), anyhow::Error> {
Ok(()) Ok(())
} }
#[allow(unused_mut, clippy::vec_init_then_push)]
fn print_version(verbose: bool) -> Result<(), anyhow::Error> { fn print_version(verbose: bool) -> Result<(), anyhow::Error> {
if !verbose { if !verbose {
println!("{}", env!("CARGO_PKG_VERSION")); println!("{}", env!("CARGO_PKG_VERSION"));
@@ -380,7 +375,6 @@ fn print_version(verbose: bool) -> Result<(), anyhow::Error> {
println!("commit-date: {}", env!("WASMER_BUILD_DATE")); println!("commit-date: {}", env!("WASMER_BUILD_DATE"));
println!("host: {}", target_lexicon::HOST); println!("host: {}", target_lexicon::HOST);
println!("compiler: {}", { println!("compiler: {}", {
#[allow(unused_mut)]
let mut s = Vec::<&'static str>::new(); let mut s = Vec::<&'static str>::new();
#[cfg(feature = "singlepass")] #[cfg(feature = "singlepass")]

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

@@ -89,7 +89,7 @@ impl RunWithoutFile {
if m == "." { if m == "." {
self.wasi.map_dir("/", pkg_fs); self.wasi.map_dir("/", pkg_fs);
} else { } else {
if m.starts_with(".") { if m.starts_with('.') {
m = format!("{}{}", pkg_fs.display(), &m[1..]); m = format!("{}{}", pkg_fs.display(), &m[1..]);
} }
let path = std::path::Path::new(&m).to_path_buf(); let path = std::path::Path::new(&m).to_path_buf();
@@ -102,7 +102,7 @@ impl RunWithoutFile {
if let Some(fs) = manifest.as_ref().and_then(|m| m.fs.as_ref()) { if let Some(fs) = manifest.as_ref().and_then(|m| m.fs.as_ref()) {
for (alias, real_dir) in fs.iter() { for (alias, real_dir) in fs.iter() {
let mut real_dir = format!("{}", real_dir.display()); let mut real_dir = format!("{}", real_dir.display());
if real_dir.starts_with("/") { if real_dir.starts_with('/') {
real_dir = (&real_dir[1..]).to_string(); real_dir = (&real_dir[1..]).to_string();
} }
let real_dir = if let Some(parent) = pathbuf.parent() { let real_dir = if let Some(parent) = pathbuf.parent() {
@@ -131,7 +131,7 @@ impl RunWithoutFile {
let root_display = format!("{}", alias_pathbuf.display()); let root_display = format!("{}", alias_pathbuf.display());
for entry in walkdir::WalkDir::new(&alias_pathbuf) for entry in walkdir::WalkDir::new(&alias_pathbuf)
.into_iter() .into_iter()
.filter_entry(|e| is_dir(e)) .filter_entry(is_dir)
.filter_map(|e| e.ok()) .filter_map(|e| e.ok())
{ {
let pathbuf = entry.path().canonicalize().unwrap(); let pathbuf = entry.path().canonicalize().unwrap();