From 5bf4209bd138faf76e3bd316fdfa128a08f2bb2e Mon Sep 17 00:00:00 2001 From: 魏曹先生 <1992414357@qq.com> Date: Tue, 28 Apr 2026 21:37:34 +0800 Subject: Apply clippy suggestions for code simplification --- mling/src/cli/list.rs | 4 +--- mling/src/cli/namespace_mgr.rs | 8 ++++---- mling/src/cli/read.rs | 4 +--- mling/src/namespace_manager.rs | 8 +++----- mling/src/project_installer.rs | 6 ++---- mling/src/project_solver.rs | 3 +-- 6 files changed, 12 insertions(+), 21 deletions(-) (limited to 'mling') diff --git a/mling/src/cli/list.rs b/mling/src/cli/list.rs index faf1866..a0c68a0 100644 --- a/mling/src/cli/list.rs +++ b/mling/src/cli/list.rs @@ -109,9 +109,7 @@ fn print_list(title: String, list: Vec, r: &mut RenderResult) { r_println!("{}", title); - let mut i = 1; - for namespace in list.iter() { + for (i, namespace) in (1..).zip(list.iter()) { r_println!(" {}. {}", i.to_string(), namespace.bold()); - i += 1; } } diff --git a/mling/src/cli/namespace_mgr.rs b/mling/src/cli/namespace_mgr.rs index 9781040..4f70c15 100644 --- a/mling/src/cli/namespace_mgr.rs +++ b/mling/src/cli/namespace_mgr.rs @@ -26,7 +26,7 @@ pub(crate) fn comp_trust(ctx: &ShellContext) -> Suggest { return Suggest::Suggest( list_namespaces(false, true, true) .into_iter() - .map(|i| SuggestItem::new(i)) + .map(SuggestItem::new) .collect::>(), ); } @@ -39,7 +39,7 @@ pub(crate) fn comp_untrust(ctx: &ShellContext) -> Suggest { return Suggest::Suggest( list_namespaces(true, false, true) .into_iter() - .map(|i| SuggestItem::new(i)) + .map(SuggestItem::new) .collect::>(), ); } @@ -61,7 +61,7 @@ pub(crate) fn comp_set_trust(ctx: &ShellContext) -> Suggest { return Suggest::Suggest( list_namespaces(true, true, true) .into_iter() - .map(|i| SuggestItem::new(i)) + .map(SuggestItem::new) .collect::>(), ); } @@ -74,7 +74,7 @@ pub(crate) fn comp_remove_namespace(ctx: &ShellContext) -> Suggest { return Suggest::Suggest( list_namespaces(true, true, true) .into_iter() - .map(|i| SuggestItem::new(i)) + .map(SuggestItem::new) .collect::>(), ); } diff --git a/mling/src/cli/read.rs b/mling/src/cli/read.rs index 8717932..3bd9fc2 100644 --- a/mling/src/cli/read.rs +++ b/mling/src/cli/read.rs @@ -64,14 +64,12 @@ pub(crate) fn render_dir(prev: ResultDir) { #[renderer] pub(crate) fn render_binaries(prev: ResultBinaries) { - let mut i = 1; - for item in prev.bin.iter() { + for (i, item) in (1..).zip(prev.bin.iter()) { r_println!( "{}. {} ({})", i.to_string(), item.name.bold(), item.path.to_string_lossy().underline().bright_cyan() ); - i += 1; } } diff --git a/mling/src/namespace_manager.rs b/mling/src/namespace_manager.rs index 4d36136..cc94f2e 100644 --- a/mling/src/namespace_manager.rs +++ b/mling/src/namespace_manager.rs @@ -23,9 +23,9 @@ pub fn list_namespaces( Err(_) => continue, }; let path = entry.path(); - if path.is_dir() { - if let Some(name) = path.file_name() { - if let Some(name_str) = name.to_str() { + if path.is_dir() + && let Some(name) = path.file_name() + && let Some(name_str) = name.to_str() { // Skip directories starting with a dot if name_str.starts_with('.') { continue; @@ -42,8 +42,6 @@ pub fn list_namespaces( namespaces.push(namespace); } } - } - } } namespaces diff --git a/mling/src/project_installer.rs b/mling/src/project_installer.rs index d004e40..5c21462 100644 --- a/mling/src/project_installer.rs +++ b/mling/src/project_installer.rs @@ -44,8 +44,7 @@ pub fn install_this_project( .current_dir(workspace_root) .status()?; if !status.success() { - return Err(std::io::Error::new( - std::io::ErrorKind::Other, + return Err(std::io::Error::other( "exec `cargo clean` failed", )); } @@ -57,8 +56,7 @@ pub fn install_this_project( .current_dir(workspace_root) .status()?; if !status.success() { - return Err(std::io::Error::new( - std::io::ErrorKind::Other, + return Err(std::io::Error::other( "cargo build --release failed", )); } diff --git a/mling/src/project_solver.rs b/mling/src/project_solver.rs index 381bba2..b6517b3 100644 --- a/mling/src/project_solver.rs +++ b/mling/src/project_solver.rs @@ -40,8 +40,7 @@ fn solve_inner(current: &PathBuf) -> Result<(PathBuf, PathBuf, Vec), .output()?; if !output.status.success() { let stderr = String::from_utf8_lossy(&output.stderr); - return Err(std::io::Error::new( - std::io::ErrorKind::Other, + return Err(std::io::Error::other( format!("cargo metadata failed: {}", stderr), )); } -- cgit