From e58c544f373b83ee7f077bae81b365b39950fc5e Mon Sep 17 00:00:00 2001 From: Eric Huss Date: Sun, 28 Feb 2021 19:03:06 -0800 Subject: [PATCH] Some minor code cleanup. --- src/bin/cargo/main.rs | 5 ++--- src/cargo/core/compiler/build_context/target_info.rs | 10 +++++----- src/cargo/core/compiler/compilation.rs | 4 ++-- src/cargo/core/package.rs | 4 ++-- src/cargo/core/resolver/resolve.rs | 2 +- src/cargo/core/resolver/types.rs | 4 ++-- src/cargo/ops/cargo_new.rs | 5 +---- src/cargo/ops/cargo_test.rs | 2 +- src/cargo/sources/registry/index.rs | 2 +- src/cargo/util/config/mod.rs | 12 ++++-------- src/cargo/util/process_builder.rs | 2 +- tests/testsuite/old_cargos.rs | 8 ++++---- tests/testsuite/update.rs | 2 +- 13 files changed, 27 insertions(+), 35 deletions(-) diff --git a/src/bin/cargo/main.rs b/src/bin/cargo/main.rs index 85b45a360ea..cfe2d1f0e1a 100644 --- a/src/bin/cargo/main.rs +++ b/src/bin/cargo/main.rs @@ -76,9 +76,8 @@ fn aliased_command(config: &Config, command: &str) -> CargoResult config.get::>>(&alias_name)?, }; - let result = user_alias.or_else(|| match builtin_aliases_execs(command) { - Some(command_str) => Some(vec![command_str.1.to_string()]), - None => None, + let result = user_alias.or_else(|| { + builtin_aliases_execs(command).map(|command_str| vec![command_str.1.to_string()]) }); Ok(result) } diff --git a/src/cargo/core/compiler/build_context/target_info.rs b/src/cargo/core/compiler/build_context/target_info.rs index 5fed2baa410..4d3244b0d94 100644 --- a/src/cargo/core/compiler/build_context/target_info.rs +++ b/src/cargo/core/compiler/build_context/target_info.rs @@ -699,10 +699,10 @@ impl RustcTargetData { Ok(RustcTargetData { rustc, - target_config, - target_info, host_config, host_info, + target_config, + target_info, }) } @@ -766,7 +766,7 @@ pub struct RustDocFingerprint { impl RustDocFingerprint { /// Read the `RustDocFingerprint` info from the fingerprint file. - fn read<'a, 'cfg>(cx: &Context<'a, 'cfg>) -> CargoResult { + fn read(cx: &Context<'_, '_>) -> CargoResult { let rustdoc_data = paths::read(&cx.files().host_root().join(".rustdoc_fingerprint.json"))?; serde_json::from_str(&rustdoc_data).map_err(|e| anyhow::anyhow!("{:?}", e)) } @@ -779,7 +779,7 @@ impl RustDocFingerprint { ) } - fn remove_doc_dirs(doc_dirs: &Vec<&Path>) -> CargoResult<()> { + fn remove_doc_dirs(doc_dirs: &[&Path]) -> CargoResult<()> { doc_dirs .iter() .filter(|path| path.exists()) @@ -795,7 +795,7 @@ impl RustDocFingerprint { /// the rustdoc fingerprint info in order to guarantee that we won't end up with mixed /// versions of the `js/html/css` files that `rustdoc` autogenerates which do not have /// any versioning. - pub fn check_rustdoc_fingerprint<'a, 'cfg>(cx: &Context<'a, 'cfg>) -> CargoResult<()> { + pub fn check_rustdoc_fingerprint(cx: &Context<'_, '_>) -> CargoResult<()> { let actual_rustdoc_target_data = RustDocFingerprint { rustc_vv: cx.bcx.rustc().verbose_version.clone(), }; diff --git a/src/cargo/core/compiler/compilation.rs b/src/cargo/core/compiler/compilation.rs index 626f4f56388..dbde49eb2c3 100644 --- a/src/cargo/core/compiler/compilation.rs +++ b/src/cargo/core/compiler/compilation.rs @@ -341,8 +341,8 @@ impl<'cfg> Compilation<'cfg> { if self.config.cli_unstable().configurable_env { // Apply any environment variables from the config for (key, value) in self.config.env_config()?.iter() { - if value.is_force() || cmd.get_env(&key).is_none() { - cmd.env(&key, value.resolve(&self.config)); + if value.is_force() || cmd.get_env(key).is_none() { + cmd.env(key, value.resolve(self.config)); } } } diff --git a/src/cargo/core/package.rs b/src/cargo/core/package.rs index 6585e29aec7..301c11c23ce 100644 --- a/src/cargo/core/package.rs +++ b/src/cargo/core/package.rs @@ -434,11 +434,11 @@ impl<'cfg> PackageSet<'cfg> { }) } - pub fn package_ids<'a>(&'a self) -> impl Iterator + 'a { + pub fn package_ids(&self) -> impl Iterator + '_ { self.packages.keys().cloned() } - pub fn packages<'a>(&'a self) -> impl Iterator + 'a { + pub fn packages(&self) -> impl Iterator { self.packages.values().filter_map(|p| p.borrow()) } diff --git a/src/cargo/core/resolver/resolve.rs b/src/cargo/core/resolver/resolve.rs index 2d99fa7b2aa..d024959b9e9 100644 --- a/src/cargo/core/resolver/resolve.rs +++ b/src/cargo/core/resolver/resolve.rs @@ -236,7 +236,7 @@ unable to verify that `{0}` is the same as when the lockfile was generated self.graph.sort() } - pub fn iter<'a>(&'a self) -> impl Iterator + 'a { + pub fn iter(&self) -> impl Iterator + '_ { self.graph.iter().cloned() } diff --git a/src/cargo/core/resolver/types.rs b/src/cargo/core/resolver/types.rs index d5b20d6afe6..bdb493e550e 100644 --- a/src/cargo/core/resolver/types.rs +++ b/src/cargo/core/resolver/types.rs @@ -173,7 +173,7 @@ impl DepsFrame { .unwrap_or(0) } - pub fn flatten<'a>(&'a self) -> impl Iterator + 'a { + pub fn flatten(&self) -> impl Iterator + '_ { self.remaining_siblings .clone() .map(move |(d, _, _)| (self.parent.package_id(), d)) @@ -247,7 +247,7 @@ impl RemainingDeps { } None } - pub fn iter<'a>(&'a mut self) -> impl Iterator + 'a { + pub fn iter(&mut self) -> impl Iterator + '_ { self.data.iter().flat_map(|(other, _)| other.flatten()) } } diff --git a/src/cargo/ops/cargo_new.rs b/src/cargo/ops/cargo_new.rs index 06b88084c5e..25b88d11352 100644 --- a/src/cargo/ops/cargo_new.rs +++ b/src/cargo/ops/cargo_new.rs @@ -831,10 +831,7 @@ fn discover_author(path: &Path) -> (Option, Option) { .or_else(|| git_config.and_then(|g| g.get_string("user.name").ok())) .or_else(|| get_environment_variable(&name_variables[3..])); - let name = match name { - Some(namestr) => Some(namestr.trim().to_string()), - None => None, - }; + let name = name.map(|namestr| namestr.trim().to_string()); let email_variables = [ "CARGO_EMAIL", diff --git a/src/cargo/ops/cargo_test.rs b/src/cargo/ops/cargo_test.rs index 1cc8b2f44e9..835ba323c59 100644 --- a/src/cargo/ops/cargo_test.rs +++ b/src/cargo/ops/cargo_test.rs @@ -92,7 +92,7 @@ fn run_unit_tests( "{} ({})", test_path .strip_prefix(unit.pkg.root()) - .unwrap_or(&test_path) + .unwrap_or(test_path) .display(), path.strip_prefix(cwd).unwrap_or(path).display() ) diff --git a/src/cargo/sources/registry/index.rs b/src/cargo/sources/registry/index.rs index 729b502cf1d..e454ee7ee2a 100644 --- a/src/cargo/sources/registry/index.rs +++ b/src/cargo/sources/registry/index.rs @@ -837,7 +837,7 @@ impl IndexSummary { } } -fn split<'a>(haystack: &'a [u8], needle: u8) -> impl Iterator + 'a { +fn split(haystack: &[u8], needle: u8) -> impl Iterator { struct Split<'a> { haystack: &'a [u8], needle: u8, diff --git a/src/cargo/util/config/mod.rs b/src/cargo/util/config/mod.rs index a71d84cedfe..ecf21d1e810 100644 --- a/src/cargo/util/config/mod.rs +++ b/src/cargo/util/config/mod.rs @@ -315,10 +315,9 @@ impl Config { /// Gets the default Cargo registry. pub fn default_registry(&self) -> CargoResult> { - Ok(match self.get_string("registry.default")? { - Some(registry) => Some(registry.val), - None => None, - }) + Ok(self + .get_string("registry.default")? + .map(|registry| registry.val)) } /// Gets a reference to the shell, e.g., for writing error messages. @@ -808,10 +807,7 @@ impl Config { (false, _, false) => Verbosity::Normal, }; - let cli_target_dir = match target_dir.as_ref() { - Some(dir) => Some(Filesystem::new(dir.clone())), - None => None, - }; + let cli_target_dir = target_dir.as_ref().map(|dir| Filesystem::new(dir.clone())); self.shell().set_verbosity(verbosity); self.shell().set_color_choice(color)?; diff --git a/src/cargo/util/process_builder.rs b/src/cargo/util/process_builder.rs index f2303981402..7f5bf6fa392 100644 --- a/src/cargo/util/process_builder.rs +++ b/src/cargo/util/process_builder.rs @@ -276,9 +276,9 @@ impl ProcessBuilder { })() .chain_err(|| process_error(&format!("could not execute process {}", self), None, None))?; let output = Output { + status, stdout, stderr, - status, }; { diff --git a/tests/testsuite/old_cargos.rs b/tests/testsuite/old_cargos.rs index 5c82c6c8331..05c2a68626b 100644 --- a/tests/testsuite/old_cargos.rs +++ b/tests/testsuite/old_cargos.rs @@ -393,7 +393,7 @@ fn new_features() { .. }) = err.downcast_ref::() { - let stderr = std::str::from_utf8(&stderr).unwrap(); + let stderr = std::str::from_utf8(stderr).unwrap(); if !stderr.contains(contents) { tc_result.push(format!( "{} expected to see error contents:\n{}\nbut saw:\n{}", @@ -428,7 +428,7 @@ fn new_features() { } let which = "locked bar 1.0.0"; - lock_bar_to(&version, 100); + lock_bar_to(version, 100); match run_cargo() { Ok(behavior) => { check_lock!(tc_result, "bar", which, behavior.bar, "1.0.0"); @@ -441,7 +441,7 @@ fn new_features() { } let which = "locked bar 1.0.1"; - lock_bar_to(&version, 101); + lock_bar_to(version, 101); match run_cargo() { Ok(behavior) => { check_lock!(tc_result, "bar", which, behavior.bar, "1.0.1"); @@ -463,7 +463,7 @@ fn new_features() { } let which = "locked bar 1.0.2"; - lock_bar_to(&version, 102); + lock_bar_to(version, 102); match run_cargo() { Ok(behavior) => { check_lock!(tc_result, "bar", which, behavior.bar, "1.0.2"); diff --git a/tests/testsuite/update.rs b/tests/testsuite/update.rs index eed45439358..8a4d589989f 100644 --- a/tests/testsuite/update.rs +++ b/tests/testsuite/update.rs @@ -584,7 +584,7 @@ fn preserve_top_comment() { let mut lines = lockfile.lines().collect::>(); lines.insert(2, "# some other comment"); let mut lockfile = lines.join("\n"); - lockfile.push_str("\n"); // .lines/.join loses the last newline + lockfile.push('\n'); // .lines/.join loses the last newline println!("saving Cargo.lock contents:\n{}", lockfile); p.change_file("Cargo.lock", &lockfile);