diff --git a/src/bin/cargo/cli.rs b/src/bin/cargo/cli.rs
index a1b8eb8ce7b..af02bbbfae7 100644
--- a/src/bin/cargo/cli.rs
+++ b/src/bin/cargo/cli.rs
@@ -47,7 +47,7 @@ Run with 'cargo -Z [FLAG] [SUBCOMMAND]'"
         return Ok(());
     }
 
-    if let Some(ref code) = args.value_of("explain") {
+    if let Some(code) = args.value_of("explain") {
         let mut procss = config.rustc(None)?.process();
         procss.arg("--explain").arg(code).exec()?;
         return Ok(());
diff --git a/src/bin/cargo/main.rs b/src/bin/cargo/main.rs
index d0a18293f6e..39bc48f6887 100644
--- a/src/bin/cargo/main.rs
+++ b/src/bin/cargo/main.rs
@@ -1,6 +1,8 @@
 #![warn(rust_2018_idioms)] // while we're getting used to 2018
 #![allow(clippy::too_many_arguments)] // large project
 #![allow(clippy::redundant_closure)] // there's a false positive
+#![warn(clippy::needless_borrow)]
+#![warn(clippy::redundant_clone)]
 
 use std::collections::BTreeSet;
 use std::env;
diff --git a/src/cargo/core/compiler/build_plan.rs b/src/cargo/core/compiler/build_plan.rs
index d6c79d004be..efdfe1153ec 100644
--- a/src/cargo/core/compiler/build_plan.rs
+++ b/src/cargo/core/compiler/build_plan.rs
@@ -113,7 +113,7 @@ impl BuildPlan {
         let id = self.plan.invocations.len();
         self.invocation_map.insert(unit.buildkey(), id);
         let deps = cx
-            .dep_targets(&unit)
+            .dep_targets(unit)
             .iter()
             .map(|dep| self.invocation_map[&dep.buildkey()])
             .collect();
diff --git a/src/cargo/core/compiler/compilation.rs b/src/cargo/core/compiler/compilation.rs
index afe2c9e4859..11014bae39a 100644
--- a/src/cargo/core/compiler/compilation.rs
+++ b/src/cargo/core/compiler/compilation.rs
@@ -120,7 +120,7 @@ impl<'cfg> Compilation<'cfg> {
             rustc_process: rustc,
             host: bcx.host_triple().to_string(),
             target: bcx.target_triple().to_string(),
-            target_runner: target_runner(&bcx)?,
+            target_runner: target_runner(bcx)?,
         })
     }
 
diff --git a/src/cargo/core/compiler/context/compilation_files.rs b/src/cargo/core/compiler/context/compilation_files.rs
index 2808c286975..fd30a92a4e2 100644
--- a/src/cargo/core/compiler/context/compilation_files.rs
+++ b/src/cargo/core/compiler/context/compilation_files.rs
@@ -491,7 +491,7 @@ fn compute_metadata<'a, 'cfg>(
     // settings like debuginfo and whatnot.
     unit.profile.hash(&mut hasher);
     unit.mode.hash(&mut hasher);
-    if let Some(ref args) = bcx.extra_args_for(unit) {
+    if let Some(args) = bcx.extra_args_for(unit) {
         args.hash(&mut hasher);
     }
 
diff --git a/src/cargo/core/compiler/context/mod.rs b/src/cargo/core/compiler/context/mod.rs
index 650e7d2f552..511f3ec987a 100644
--- a/src/cargo/core/compiler/context/mod.rs
+++ b/src/cargo/core/compiler/context/mod.rs
@@ -474,11 +474,11 @@ impl<'a, 'cfg> Context<'a, 'cfg> {
         for unit in keys {
             for output in self.outputs(unit)?.iter() {
                 if let Some(other_unit) = output_collisions.insert(output.path.clone(), unit) {
-                    report_collision(unit, &other_unit, &output.path)?;
+                    report_collision(unit, other_unit, &output.path)?;
                 }
                 if let Some(hardlink) = output.hardlink.as_ref() {
                     if let Some(other_unit) = output_collisions.insert(hardlink.clone(), unit) {
-                        report_collision(unit, &other_unit, hardlink)?;
+                        report_collision(unit, other_unit, hardlink)?;
                     }
                 }
                 if let Some(ref export_path) = output.export_path {
@@ -488,7 +488,7 @@ impl<'a, 'cfg> Context<'a, 'cfg> {
                              {}\
                              The exported filenames should be unique.\n\
                              {}",
-                            describe_collision(unit, &other_unit, &export_path),
+                            describe_collision(unit, other_unit, export_path),
                             suggestion
                         ))?;
                     }
diff --git a/src/cargo/core/compiler/custom_build.rs b/src/cargo/core/compiler/custom_build.rs
index 3015ed89444..7516812842c 100644
--- a/src/cargo/core/compiler/custom_build.rs
+++ b/src/cargo/core/compiler/custom_build.rs
@@ -162,7 +162,7 @@ fn build_work<'a, 'cfg>(cx: &mut Context<'a, 'cfg>, unit: &Unit<'a>) -> CargoRes
         .env(
             "TARGET",
             &match unit.kind {
-                Kind::Host => &bcx.host_triple(),
+                Kind::Host => bcx.host_triple(),
                 Kind::Target => bcx.target_triple(),
             },
         )
diff --git a/src/cargo/core/compiler/fingerprint.rs b/src/cargo/core/compiler/fingerprint.rs
index a49ee867f9c..a01723c4498 100644
--- a/src/cargo/core/compiler/fingerprint.rs
+++ b/src/cargo/core/compiler/fingerprint.rs
@@ -682,7 +682,7 @@ fn calculate<'a, 'cfg>(
         local.extend(local_fingerprint_run_custom_build_deps(cx, unit));
         local
     } else {
-        let fingerprint = pkg_fingerprint(&cx.bcx, unit.pkg)?;
+        let fingerprint = pkg_fingerprint(cx.bcx, unit.pkg)?;
         vec![LocalFingerprint::Precalculated(fingerprint)]
     };
 
@@ -701,7 +701,7 @@ fn calculate<'a, 'cfg>(
         profile: profile_hash,
         // Note that .0 is hashed here, not .1 which is the cwd. That doesn't
         // actually affect the output artifact so there's no need to hash it.
-        path: util::hash_u64(&super::path_args(&cx.bcx, unit).0),
+        path: util::hash_u64(&super::path_args(cx.bcx, unit).0),
         features: format!("{:?}", bcx.resolve.features_sorted(unit.pkg.package_id())),
         deps,
         local,
@@ -855,7 +855,7 @@ fn build_script_local_fingerprints<'a, 'cfg>(
     let output = deps.build_script_output.clone();
     if deps.rerun_if_changed.is_empty() && deps.rerun_if_env_changed.is_empty() {
         debug!("old local fingerprints deps");
-        let s = pkg_fingerprint(&cx.bcx, unit.pkg)?;
+        let s = pkg_fingerprint(cx.bcx, unit.pkg)?;
         return Ok((vec![LocalFingerprint::Precalculated(s)], Some(output)));
     }
 
diff --git a/src/cargo/core/compiler/mod.rs b/src/cargo/core/compiler/mod.rs
index cb7136c1f7a..534c707d6c1 100644
--- a/src/cargo/core/compiler/mod.rs
+++ b/src/cargo/core/compiler/mod.rs
@@ -640,7 +640,7 @@ fn rustdoc<'a, 'cfg>(cx: &mut Context<'a, 'cfg>, unit: &Unit<'a>) -> CargoResult
 
     add_error_format(bcx, &mut rustdoc);
 
-    if let Some(ref args) = bcx.extra_args_for(unit) {
+    if let Some(args) = bcx.extra_args_for(unit) {
         rustdoc.args(args);
     }
 
@@ -831,7 +831,7 @@ fn build_base_args<'a, 'cfg>(
         cmd.arg("-C").arg(format!("debuginfo={}", debuginfo));
     }
 
-    if let Some(ref args) = bcx.extra_args_for(unit) {
+    if let Some(args) = bcx.extra_args_for(unit) {
         cmd.args(args);
     }
 
diff --git a/src/cargo/core/package.rs b/src/cargo/core/package.rs
index a4850b11f9b..36f612d3305 100644
--- a/src/cargo/core/package.rs
+++ b/src/cargo/core/package.rs
@@ -105,7 +105,7 @@ impl ser::Serialize for Package {
 
         SerializedPackage {
             name: &*package_id.name(),
-            version: &package_id.version(),
+            version: package_id.version(),
             id: package_id,
             license,
             license_file,
@@ -740,7 +740,7 @@ impl<'a, 'cfg> Downloads<'a, 'cfg> {
             self.set.multi.messages(|msg| {
                 let token = msg.token().expect("failed to read token");
                 let handle = &pending[&token].1;
-                if let Some(result) = msg.result_for(&handle) {
+                if let Some(result) = msg.result_for(handle) {
                     results.push((token, result));
                 } else {
                     debug!("message without a result (?)");
diff --git a/src/cargo/core/source/source_id.rs b/src/cargo/core/source/source_id.rs
index dd5f5ff9af5..38231069b10 100644
--- a/src/cargo/core/source/source_id.rs
+++ b/src/cargo/core/source/source_id.rs
@@ -368,7 +368,7 @@ impl PartialOrd for SourceId {
 
 impl Ord for SourceId {
     fn cmp(&self, other: &SourceId) -> Ordering {
-        self.inner.cmp(&other.inner)
+        self.inner.cmp(other.inner)
     }
 }
 
diff --git a/src/cargo/core/summary.rs b/src/cargo/core/summary.rs
index 65a1a6bfc56..69f290435b1 100644
--- a/src/cargo/core/summary.rs
+++ b/src/cargo/core/summary.rs
@@ -58,7 +58,7 @@ impl Summary {
                 )
             }
         }
-        let feature_map = build_feature_map(&features, &dependencies, namespaced_features)?;
+        let feature_map = build_feature_map(features, &dependencies, namespaced_features)?;
         Ok(Summary {
             inner: Rc::new(Inner {
                 package_id: pkg_id,
@@ -170,7 +170,7 @@ where
         // iteration over the list if the dependency is found in the list.
         let mut dependency_found = if namespaced {
             match dep_map.get(feature.borrow()) {
-                Some(ref dep_data) => {
+                Some(dep_data) => {
                     if !dep_data.iter().any(|d| d.is_optional()) {
                         failure::bail!(
                             "Feature `{}` includes the dependency of the same name, but this is \
diff --git a/src/cargo/lib.rs b/src/cargo/lib.rs
index db193897bf9..e15a914cc8b 100644
--- a/src/cargo/lib.rs
+++ b/src/cargo/lib.rs
@@ -14,6 +14,8 @@
 #![allow(clippy::too_many_arguments)] // large project
 #![allow(clippy::type_complexity)] // there's an exceptionally complex type
 #![allow(clippy::wrong_self_convention)] // perhaps `Rc` should be special-cased in Clippy?
+#![warn(clippy::needless_borrow)]
+#![warn(clippy::redundant_clone)]
 
 use std::fmt;
 
diff --git a/src/cargo/ops/cargo_compile.rs b/src/cargo/ops/cargo_compile.rs
index 7c567ec8bf5..3813366dcc9 100644
--- a/src/cargo/ops/cargo_compile.rs
+++ b/src/cargo/ops/cargo_compile.rs
@@ -372,12 +372,12 @@ pub fn compile_ws<'a>(
             &resolve_with_overrides,
             &packages,
             config,
-            &build_config,
+            build_config,
             profiles,
             extra_compiler_args,
         )?;
         let cx = Context::new(config, &bcx)?;
-        cx.compile(&units, export_dir.clone(), &exec)?
+        cx.compile(&units, export_dir.clone(), exec)?
     };
 
     Ok(ret)
diff --git a/src/cargo/ops/cargo_output_metadata.rs b/src/cargo/ops/cargo_output_metadata.rs
index 0359f179eaa..957664cfda5 100644
--- a/src/cargo/ops/cargo_output_metadata.rs
+++ b/src/cargo/ops/cargo_output_metadata.rs
@@ -42,7 +42,7 @@ fn metadata_no_deps(ws: &Workspace<'_>, _opt: &OutputMetadataOptions) -> CargoRe
         packages: ws.members().cloned().collect(),
         workspace_members: ws.members().map(|pkg| pkg.package_id()).collect(),
         resolve: None,
-        target_directory: ws.target_dir().clone().into_path_unlocked(),
+        target_directory: ws.target_dir().into_path_unlocked(),
         version: VERSION,
         workspace_root: ws.root().to_path_buf(),
     })
@@ -70,7 +70,7 @@ fn metadata_full(ws: &Workspace<'_>, opt: &OutputMetadataOptions) -> CargoResult
             resolve: (packages, resolve),
             root: ws.current_opt().map(|pkg| pkg.package_id()),
         }),
-        target_directory: ws.target_dir().clone().into_path_unlocked(),
+        target_directory: ws.target_dir().into_path_unlocked(),
         version: VERSION,
         workspace_root: ws.root().to_path_buf(),
     })
diff --git a/src/cargo/ops/cargo_package.rs b/src/cargo/ops/cargo_package.rs
index f0b6618d1e8..0908056da63 100644
--- a/src/cargo/ops/cargo_package.rs
+++ b/src/cargo/ops/cargo_package.rs
@@ -59,7 +59,7 @@ pub fn package(ws: &Workspace<'_>, opts: &PackageOpts<'_>) -> CargoResult<Option
     // dirty. This will `bail!` if dirty, unless allow_dirty. Produce json
     // info for any sha1 (HEAD revision) returned.
     let vcs_info = if !opts.allow_dirty {
-        check_repo_state(pkg, &src_files, &config, opts.allow_dirty)?
+        check_repo_state(pkg, &src_files, config, opts.allow_dirty)?
             .map(|h| json!({"git":{"sha1": h}}))
     } else {
         None
@@ -364,7 +364,7 @@ fn tar(
         }
     }
 
-    if let Some(ref json) = vcs_info {
+    if let Some(json) = vcs_info {
         let filename: PathBuf = Path::new(VCS_INFO_FILE).into();
         debug_assert!(check_filename(&filename).is_ok());
         let fnd = filename.display();
diff --git a/src/cargo/ops/cargo_uninstall.rs b/src/cargo/ops/cargo_uninstall.rs
index 3ffa7dd05cf..ca2fff7dfdc 100644
--- a/src/cargo/ops/cargo_uninstall.rs
+++ b/src/cargo/ops/cargo_uninstall.rs
@@ -147,7 +147,7 @@ fn uninstall_pkgid(
             installed.remove();
         }
     }
-    write_crate_list(&crate_metadata, metadata)?;
+    write_crate_list(crate_metadata, metadata)?;
     for bin in to_remove {
         config.shell().status("Removing", bin.display())?;
         paths::remove_file(bin)?;
diff --git a/src/cargo/ops/registry.rs b/src/cargo/ops/registry.rs
index cfc238d27e7..f52d85b9182 100644
--- a/src/cargo/ops/registry.rs
+++ b/src/cargo/ops/registry.rs
@@ -238,7 +238,7 @@ fn transmit(
         .map(|(feat, values)| {
             (
                 feat.to_string(),
-                values.iter().map(|fv| fv.to_string(&summary)).collect(),
+                values.iter().map(|fv| fv.to_string(summary)).collect(),
             )
         })
         .collect::<BTreeMap<String, Vec<String>>>();
diff --git a/src/cargo/util/command_prelude.rs b/src/cargo/util/command_prelude.rs
index d36f602afb0..3c3c7976f93 100644
--- a/src/cargo/util/command_prelude.rs
+++ b/src/cargo/util/command_prelude.rs
@@ -434,19 +434,19 @@ about this warning.";
         compile_opts: &CompileOptions<'_>,
     ) -> CargoResult<()> {
         if self.is_present_with_zero_values("example") {
-            print_available_examples(&workspace, &compile_opts)?;
+            print_available_examples(workspace, compile_opts)?;
         }
 
         if self.is_present_with_zero_values("bin") {
-            print_available_binaries(&workspace, &compile_opts)?;
+            print_available_binaries(workspace, compile_opts)?;
         }
 
         if self.is_present_with_zero_values("bench") {
-            print_available_benches(&workspace, &compile_opts)?;
+            print_available_benches(workspace, compile_opts)?;
         }
 
         if self.is_present_with_zero_values("test") {
-            print_available_tests(&workspace, &compile_opts)?;
+            print_available_tests(workspace, compile_opts)?;
         }
 
         Ok(())
diff --git a/src/cargo/util/dependency_queue.rs b/src/cargo/util/dependency_queue.rs
index f8ef19e8f9a..e8b23e6263d 100644
--- a/src/cargo/util/dependency_queue.rs
+++ b/src/cargo/util/dependency_queue.rs
@@ -124,7 +124,7 @@ impl<K: Hash + Eq + Clone, V> DependencyQueue<K, V> {
             results.insert(key.clone(), IN_PROGRESS);
 
             let depth = 1 + map
-                .get(&key)
+                .get(key)
                 .into_iter()
                 .flat_map(|it| it)
                 .map(|dep| depth(dep, map, results))
diff --git a/src/cargo/util/toml/mod.rs b/src/cargo/util/toml/mod.rs
index a3d53d962d8..0c66b7158c1 100644
--- a/src/cargo/util/toml/mod.rs
+++ b/src/cargo/util/toml/mod.rs
@@ -835,7 +835,7 @@ impl TomlManifest {
         // Parse features first so they will be available when parsing other parts of the TOML.
         let empty = Vec::new();
         let cargo_features = me.cargo_features.as_ref().unwrap_or(&empty);
-        let features = Features::new(&cargo_features, &mut warnings)?;
+        let features = Features::new(cargo_features, &mut warnings)?;
 
         let project = me.project.as_ref().or_else(|| me.package.as_ref());
         let project = project.ok_or_else(|| failure::format_err!("no `package` section found"))?;
@@ -1010,7 +1010,7 @@ impl TomlManifest {
 
         let workspace_config = match (me.workspace.as_ref(), project.workspace.as_ref()) {
             (Some(config), None) => WorkspaceConfig::Root(WorkspaceRootConfig::new(
-                &package_root,
+                package_root,
                 &config.members,
                 &config.default_members,
                 &config.exclude,
@@ -1138,7 +1138,7 @@ impl TomlManifest {
         let mut deps = Vec::new();
         let empty = Vec::new();
         let cargo_features = me.cargo_features.as_ref().unwrap_or(&empty);
-        let features = Features::new(&cargo_features, &mut warnings)?;
+        let features = Features::new(cargo_features, &mut warnings)?;
 
         let (replace, patch) = {
             let mut cx = Context {
@@ -1157,7 +1157,7 @@ impl TomlManifest {
         let profiles = Profiles::new(me.profile.as_ref(), config, &features, &mut warnings)?;
         let workspace_config = match me.workspace {
             Some(ref config) => WorkspaceConfig::Root(WorkspaceRootConfig::new(
-                &root,
+                root,
                 &config.members,
                 &config.default_members,
                 &config.exclude,
diff --git a/tests/testsuite/directory.rs b/tests/testsuite/directory.rs
index a55a54a7996..80bcfcf7d65 100644
--- a/tests/testsuite/directory.rs
+++ b/tests/testsuite/directory.rs
@@ -577,7 +577,7 @@ fn git_lock_file_doesnt_change() {
     let root = paths::root();
     t!(fs::create_dir(&root.join(".cargo")));
     t!(t!(File::create(root.join(".cargo/config"))).write_all(
-        &format!(
+        format!(
             r#"
         [source.my-git-repo]
         git = '{}'
diff --git a/tests/testsuite/git.rs b/tests/testsuite/git.rs
index c364d498c83..691fa13b28e 100644
--- a/tests/testsuite/git.rs
+++ b/tests/testsuite/git.rs
@@ -158,7 +158,7 @@ fn cargo_compile_offline_with_cached_git_dep() {
         File::create(&prj.root().join("Cargo.toml"))
             .unwrap()
             .write_all(
-                &format!(
+                format!(
                     r#"
             [project]
             name = "cache_git_dep"
@@ -220,7 +220,7 @@ fn cargo_compile_offline_with_cached_git_dep() {
     File::create(&p.root().join("Cargo.toml"))
         .unwrap()
         .write_all(
-            &format!(
+            format!(
                 r#"
         [project]
         name = "foo"
@@ -2861,7 +2861,7 @@ fn templatedir_doesnt_cause_problems() {
     File::create(paths::home().join(".gitconfig"))
         .unwrap()
         .write_all(
-            &format!(
+            format!(
                 r#"
                 [init]
                 templatedir = {}
diff --git a/tests/testsuite/init.rs b/tests/testsuite/init.rs
index 2495eff8011..9ddc757bc1e 100644
--- a/tests/testsuite/init.rs
+++ b/tests/testsuite/init.rs
@@ -61,10 +61,11 @@ fn simple_bin() {
 fn simple_git_ignore_exists() {
     // write a .gitignore file with one entry
     fs::create_dir_all(paths::root().join("foo")).unwrap();
-    let mut ignore_file = File::create(paths::root().join("foo/.gitignore")).unwrap();
-    ignore_file
-        .write("/target\n**/some.file".as_bytes())
-        .unwrap();
+    fs::write(
+        paths::root().join("foo/.gitignore"),
+        "/target\n**/some.file",
+    )
+    .unwrap();
 
     cargo_process("init --lib foo --edition 2015")
         .env("USER", "foo")
diff --git a/tests/testsuite/install.rs b/tests/testsuite/install.rs
index a991d8e2ea4..05a33a0732f 100644
--- a/tests/testsuite/install.rs
+++ b/tests/testsuite/install.rs
@@ -1343,7 +1343,7 @@ fn install_global_cargo_config() {
     pkg("bar", "0.0.1");
 
     let config = cargo_home().join("config");
-    let mut toml = fs::read_to_string(&config).unwrap_or(String::new());
+    let mut toml = fs::read_to_string(&config).unwrap_or_default();
 
     toml.push_str(
         r#"
diff --git a/tests/testsuite/main.rs b/tests/testsuite/main.rs
index 38979992315..b8b86a93820 100644
--- a/tests/testsuite/main.rs
+++ b/tests/testsuite/main.rs
@@ -2,6 +2,8 @@
 #![cfg_attr(feature = "deny-warnings", deny(warnings))]
 #![allow(clippy::blacklisted_name)]
 #![allow(clippy::explicit_iter_loop)]
+#![warn(clippy::needless_borrow)]
+#![warn(clippy::redundant_clone)]
 
 #[macro_use]
 mod support;
diff --git a/tests/testsuite/metabuild.rs b/tests/testsuite/metabuild.rs
index 9fe2b117c2a..6d3d741d361 100644
--- a/tests/testsuite/metabuild.rs
+++ b/tests/testsuite/metabuild.rs
@@ -434,8 +434,7 @@ fn metabuild_metadata() {
         .as_array()
         .unwrap()
         .iter()
-        .filter(|p| p["name"].as_str().unwrap() == "foo")
-        .next()
+        .find(|p| p["name"].as_str().unwrap() == "foo")
         .unwrap()["metabuild"]
         .as_array()
         .unwrap()
diff --git a/tests/testsuite/package.rs b/tests/testsuite/package.rs
index fca74f07107..9ed18ab72c8 100644
--- a/tests/testsuite/package.rs
+++ b/tests/testsuite/package.rs
@@ -910,7 +910,7 @@ authors = []
         f,
         "bar-0.1.0.crate",
         &["Cargo.toml", "Cargo.toml.orig", "src/lib.rs"],
-        &[("Cargo.toml", &rewritten_toml)],
+        &[("Cargo.toml", rewritten_toml)],
     );
 }
 
diff --git a/tests/testsuite/path.rs b/tests/testsuite/path.rs
index 9b0001f75e2..bf272d0cf3d 100644
--- a/tests/testsuite/path.rs
+++ b/tests/testsuite/path.rs
@@ -580,7 +580,7 @@ fn override_self() {
         .build();
 
     let p = project();
-    let root = p.root().clone();
+    let root = p.root();
     let p = p
         .file(".cargo/config", &format!("paths = ['{}']", root.display()))
         .file(
diff --git a/tests/testsuite/profile_overrides.rs b/tests/testsuite/profile_overrides.rs
index fde44a4a637..7a2ff9451c9 100644
--- a/tests/testsuite/profile_overrides.rs
+++ b/tests/testsuite/profile_overrides.rs
@@ -201,7 +201,7 @@ fn profile_override_bad_settings() {
         ),
         ("overrides = {}", "Profile overrides cannot be nested."),
     ];
-    for &(ref snippet, ref expected) in bad_values.iter() {
+    for &(snippet, expected) in bad_values.iter() {
         let p = project()
             .file(
                 "Cargo.toml",
diff --git a/tests/testsuite/resolve.rs b/tests/testsuite/resolve.rs
index 2dbb4d8cc47..6fea4a69406 100644
--- a/tests/testsuite/resolve.rs
+++ b/tests/testsuite/resolve.rs
@@ -46,7 +46,7 @@ proptest! {
         // So we try some of the most complicated.
         for this in input.iter().rev().take(20) {
             let _ = resolve_and_validated(
-                &pkg_id("root"),
+                pkg_id("root"),
                 vec![dep_req(&this.name(), &format!("={}", this.version()))],
                 &reg,
             );
@@ -81,13 +81,13 @@ proptest! {
             // minimal-versions change what order the candidates
             // are tried but not the existence of a solution
             let res = resolve(
-                &pkg_id("root"),
+                pkg_id("root"),
                 vec![dep_req(&this.name(), &format!("={}", this.version()))],
                 &reg,
             );
 
             let mres = resolve_with_config(
-                &pkg_id("root"),
+                pkg_id("root"),
                 vec![dep_req(&this.name(), &format!("={}", this.version()))],
                 &reg,
                 Some(&config),
@@ -112,10 +112,10 @@ proptest! {
         let reg = registry(input.clone());
         let mut removed_input = input.clone();
         for (summery_idx, dep_idx) in indexes_to_remove {
-            if removed_input.len() > 0 {
+            if !removed_input.is_empty() {
                 let summery_idx = summery_idx.index(removed_input.len());
                 let deps = removed_input[summery_idx].dependencies();
-                if deps.len() > 0 {
+                if !deps.is_empty() {
                     let new = remove_dep(&removed_input[summery_idx], dep_idx.index(deps.len()));
                     removed_input[summery_idx] = new;
                 }
@@ -127,13 +127,13 @@ proptest! {
         // So we try some of the most complicated.
         for this in input.iter().rev().take(10) {
             if resolve(
-                &pkg_id("root"),
+                pkg_id("root"),
                 vec![dep_req(&this.name(), &format!("={}", this.version()))],
                 &reg,
             ).is_ok() {
                 prop_assert!(
                     resolve(
-                        &pkg_id("root"),
+                        pkg_id("root"),
                         vec![dep_req(&this.name(), &format!("={}", this.version()))],
                         &removed_reg,
                     ).is_ok(),
@@ -157,7 +157,7 @@ proptest! {
         // So we try some of the most complicated.
         for this in input.iter().rev().take(10) {
             let res = resolve(
-                &pkg_id("root"),
+                pkg_id("root"),
                 vec![dep_req(&this.name(), &format!("={}", this.version()))],
                 &reg,
             );
@@ -183,7 +183,7 @@ proptest! {
                         );
 
                         let res = resolve(
-                            &pkg_id("root"),
+                            pkg_id("root"),
                             vec![dep_req(&this.name(), &format!("={}", this.version()))],
                             &new_reg,
                         );
@@ -217,7 +217,7 @@ proptest! {
                     );
 
                     let res = resolve(
-                        &pkg_id("root"),
+                        pkg_id("root"),
                         vec![dep_req(&this.name(), &format!("={}", this.version()))],
                         &new_reg,
                     );
@@ -244,7 +244,7 @@ fn basic_public_dependency() {
         pkg!("C" => [dep("A"), dep("B")]),
     ]);
 
-    let res = resolve_and_validated(&pkg_id("root"), vec![dep("C")], &reg).unwrap();
+    let res = resolve_and_validated(pkg_id("root"), vec![dep("C")], &reg).unwrap();
     assert_same(
         &res,
         &names(&[
@@ -280,7 +280,7 @@ fn public_dependency_filling_in() {
         pkg!("d" => [dep("c"), dep("a"), dep("b")]),
     ]);
 
-    let res = resolve_and_validated(&pkg_id("root"), vec![dep("d")], &reg).unwrap();
+    let res = resolve_and_validated(pkg_id("root"), vec![dep("d")], &reg).unwrap();
     assert_same(
         &res,
         &names(&[
@@ -315,7 +315,7 @@ fn public_dependency_filling_in_and_update() {
         pkg!("C" => [dep("A"),dep("B")]),
         pkg!("D" => [dep("B"),dep("C")]),
     ]);
-    let res = resolve_and_validated(&pkg_id("root"), vec![dep("D")], &reg).unwrap();
+    let res = resolve_and_validated(pkg_id("root"), vec![dep("D")], &reg).unwrap();
     assert_same(
         &res,
         &names(&[
@@ -340,9 +340,9 @@ fn public_dependency_skiping() {
         pkg!(("b", "0.2.1") => [dep_req_kind("a", "0.2.0", Kind::Normal, true)]),
         pkg!("c" => [dep("a"),dep("b")]),
     ];
-    let reg = registry(input.clone());
+    let reg = registry(input);
 
-    resolve(&pkg_id("root"), vec![dep("c")], &reg).unwrap();
+    resolve(pkg_id("root"), vec![dep("c")], &reg).unwrap();
 }
 
 #[test]
@@ -360,9 +360,9 @@ fn public_dependency_skiping_in_backtracking() {
         pkg!("B" => [dep_req_kind("A", ">= 0.0.3", Kind::Normal, true)]),
         pkg!("C" => [dep_req("A", "<= 0.0.4"), dep("B")]),
     ];
-    let reg = registry(input.clone());
+    let reg = registry(input);
 
-    resolve(&pkg_id("root"), vec![dep("C")], &reg).unwrap();
+    resolve(pkg_id("root"), vec![dep("C")], &reg).unwrap();
 }
 
 #[test]
@@ -374,7 +374,7 @@ fn test_dependency_with_empty_name() {
 
 #[test]
 fn test_resolving_empty_dependency_list() {
-    let res = resolve(&pkg_id("root"), Vec::new(), &registry(vec![])).unwrap();
+    let res = resolve(pkg_id("root"), Vec::new(), &registry(vec![])).unwrap();
 
     assert_eq!(res, names(&["root"]));
 }
@@ -382,28 +382,28 @@ fn test_resolving_empty_dependency_list() {
 #[test]
 fn test_resolving_only_package() {
     let reg = registry(vec![pkg!("foo")]);
-    let res = resolve(&pkg_id("root"), vec![dep("foo")], &reg).unwrap();
+    let res = resolve(pkg_id("root"), vec![dep("foo")], &reg).unwrap();
     assert_same(&res, &names(&["root", "foo"]));
 }
 
 #[test]
 fn test_resolving_one_dep() {
     let reg = registry(vec![pkg!("foo"), pkg!("bar")]);
-    let res = resolve(&pkg_id("root"), vec![dep("foo")], &reg).unwrap();
+    let res = resolve(pkg_id("root"), vec![dep("foo")], &reg).unwrap();
     assert_same(&res, &names(&["root", "foo"]));
 }
 
 #[test]
 fn test_resolving_multiple_deps() {
     let reg = registry(vec![pkg!("foo"), pkg!("bar"), pkg!("baz")]);
-    let res = resolve(&pkg_id("root"), vec![dep("foo"), dep("baz")], &reg).unwrap();
+    let res = resolve(pkg_id("root"), vec![dep("foo"), dep("baz")], &reg).unwrap();
     assert_same(&res, &names(&["root", "foo", "baz"]));
 }
 
 #[test]
 fn test_resolving_transitive_deps() {
     let reg = registry(vec![pkg!("foo"), pkg!("bar" => ["foo"])]);
-    let res = resolve(&pkg_id("root"), vec![dep("bar")], &reg).unwrap();
+    let res = resolve(pkg_id("root"), vec![dep("bar")], &reg).unwrap();
 
     assert_same(&res, &names(&["root", "foo", "bar"]));
 }
@@ -411,7 +411,7 @@ fn test_resolving_transitive_deps() {
 #[test]
 fn test_resolving_common_transitive_deps() {
     let reg = registry(vec![pkg!("foo" => ["bar"]), pkg!("bar")]);
-    let res = resolve(&pkg_id("root"), vec![dep("foo"), dep("bar")], &reg).unwrap();
+    let res = resolve(pkg_id("root"), vec![dep("foo"), dep("bar")], &reg).unwrap();
 
     assert_same(&res, &names(&["root", "foo", "bar"]));
 }
@@ -425,7 +425,7 @@ fn test_resolving_with_same_name() {
 
     let reg = registry(list);
     let res = resolve(
-        &pkg_id("root"),
+        pkg_id("root"),
         vec![
             dep_loc("foo", "https://first.example.com"),
             dep_loc("bar", "https://second.example.com"),
@@ -453,7 +453,7 @@ fn test_resolving_with_dev_deps() {
     ]);
 
     let res = resolve(
-        &pkg_id("root"),
+        pkg_id("root"),
         vec![dep("foo"), dep_kind("baz", Kind::Development)],
         &reg,
     )
@@ -466,7 +466,7 @@ fn test_resolving_with_dev_deps() {
 fn resolving_with_many_versions() {
     let reg = registry(vec![pkg!(("foo", "1.0.1")), pkg!(("foo", "1.0.2"))]);
 
-    let res = resolve(&pkg_id("root"), vec![dep("foo")], &reg).unwrap();
+    let res = resolve(pkg_id("root"), vec![dep("foo")], &reg).unwrap();
 
     assert_same(&res, &names(&[("root", "1.0.0"), ("foo", "1.0.2")]));
 }
@@ -475,7 +475,7 @@ fn resolving_with_many_versions() {
 fn resolving_with_specific_version() {
     let reg = registry(vec![pkg!(("foo", "1.0.1")), pkg!(("foo", "1.0.2"))]);
 
-    let res = resolve(&pkg_id("root"), vec![dep_req("foo", "=1.0.1")], &reg).unwrap();
+    let res = resolve(pkg_id("root"), vec![dep_req("foo", "=1.0.1")], &reg).unwrap();
 
     assert_same(&res, &names(&[("root", "1.0.0"), ("foo", "1.0.1")]));
 }
@@ -491,7 +491,7 @@ fn test_resolving_maximum_version_with_transitive_deps() {
     ]);
 
     let res = resolve(
-        &pkg_id("root"),
+        pkg_id("root"),
         vec![dep_req("foo", "1.0.0"), dep_req("bar", "1.0.0")],
         &reg,
     )
@@ -539,7 +539,7 @@ fn test_resolving_minimum_version_with_transitive_deps() {
         .unwrap();
 
     let res = resolve_with_config(
-        &pkg_id("root"),
+        pkg_id("root"),
         vec![dep_req("foo", "1.0.0"), dep_req("bar", "1.0.0")],
         &reg,
         Some(&config),
@@ -600,7 +600,7 @@ fn resolving_incompat_versions() {
     ]);
 
     assert!(resolve(
-        &pkg_id("root"),
+        pkg_id("root"),
         vec![dep_req("foo", "=1.0.1"), dep("bar")],
         &reg
     )
@@ -615,7 +615,7 @@ fn resolving_wrong_case_from_registry() {
     // This test documents the current behavior.
     let reg = registry(vec![pkg!(("foo", "1.0.0")), pkg!("bar" => ["Foo"])]);
 
-    assert!(resolve(&pkg_id("root"), vec![dep("bar")], &reg).is_err());
+    assert!(resolve(pkg_id("root"), vec![dep("bar")], &reg).is_err());
 }
 
 #[test]
@@ -626,7 +626,7 @@ fn resolving_mis_hyphenated_from_registry() {
     // This test documents the current behavior.
     let reg = registry(vec![pkg!(("fo-o", "1.0.0")), pkg!("bar" => ["fo_o"])]);
 
-    assert!(resolve(&pkg_id("root"), vec![dep("bar")], &reg).is_err());
+    assert!(resolve(pkg_id("root"), vec![dep("bar")], &reg).is_err());
 }
 
 #[test]
@@ -638,7 +638,7 @@ fn resolving_backtrack() {
         pkg!("baz"),
     ]);
 
-    let res = resolve(&pkg_id("root"), vec![dep_req("foo", "^1")], &reg).unwrap();
+    let res = resolve(pkg_id("root"), vec![dep_req("foo", "^1")], &reg).unwrap();
 
     assert_contains(
         &res,
@@ -658,7 +658,7 @@ fn resolving_backtrack_features() {
         pkg!("bar"),
     ]);
 
-    let res = resolve(&pkg_id("root"), vec![dep_req("foo", "^1")], &reg).unwrap();
+    let res = resolve(pkg_id("root"), vec![dep_req("foo", "^1")], &reg).unwrap();
 
     assert_contains(
         &res,
@@ -680,7 +680,7 @@ fn resolving_allows_multiple_compatible_versions() {
         pkg!("d4" => [dep_req("foo", "0.2")]),
     ]);
 
-    let res = resolve(&pkg_id("root"), vec![dep("bar")], &reg).unwrap();
+    let res = resolve(pkg_id("root"), vec![dep("bar")], &reg).unwrap();
 
     assert_same(
         &res,
@@ -713,7 +713,7 @@ fn resolving_with_deep_backtracking() {
         pkg!(("dep_req", "2.0.0")),
     ]);
 
-    let res = resolve(&pkg_id("root"), vec![dep_req("foo", "1")], &reg).unwrap();
+    let res = resolve(pkg_id("root"), vec![dep_req("foo", "1")], &reg).unwrap();
 
     assert_same(
         &res,
@@ -741,7 +741,7 @@ fn resolving_with_sys_crates() {
     ]);
 
     let res = resolve(
-        &pkg_id("root"),
+        pkg_id("root"),
         vec![dep_req("d", "1"), dep_req("r", "1")],
         &reg,
     )
@@ -794,7 +794,7 @@ fn resolving_with_constrained_sibling_backtrack_parent() {
     }
     let reg = registry(reglist);
 
-    let res = resolve(&pkg_id("root"), vec![dep_req("foo", "1")], &reg).unwrap();
+    let res = resolve(pkg_id("root"), vec![dep_req("foo", "1")], &reg).unwrap();
 
     assert_contains(
         &res,
@@ -829,7 +829,7 @@ fn resolving_with_many_equivalent_backtracking() {
 
     let reg = registry(reglist.clone());
 
-    let res = resolve(&pkg_id("root"), vec![dep("level0")], &reg);
+    let res = resolve(pkg_id("root"), vec![dep("level0")], &reg);
 
     assert!(res.is_err());
 
@@ -839,7 +839,7 @@ fn resolving_with_many_equivalent_backtracking() {
 
     let reg = registry(reglist.clone());
 
-    let res = resolve(&pkg_id("root"), vec![dep("level0")], &reg).unwrap();
+    let res = resolve(pkg_id("root"), vec![dep("level0")], &reg).unwrap();
 
     assert_contains(&res, &names(&[("root", "1.0.0"), ("level0", "1.0.0")]));
 
@@ -853,7 +853,7 @@ fn resolving_with_many_equivalent_backtracking() {
     let reg = registry(reglist.clone());
 
     let res = resolve(
-        &pkg_id("root"),
+        pkg_id("root"),
         vec![dep("level0"), dep("constrained")],
         &reg,
     )
@@ -871,7 +871,7 @@ fn resolving_with_many_equivalent_backtracking() {
     let reg = registry(reglist.clone());
 
     let res = resolve(
-        &pkg_id("root"),
+        pkg_id("root"),
         vec![dep_req("level0", "1.0.1"), dep("constrained")],
         &reg,
     )
@@ -886,10 +886,10 @@ fn resolving_with_many_equivalent_backtracking() {
         ]),
     );
 
-    let reg = registry(reglist.clone());
+    let reg = registry(reglist);
 
     let res = resolve(
-        &pkg_id("root"),
+        pkg_id("root"),
         vec![dep_req("level0", "1.0.1"), dep_req("constrained", "1.1.0")],
         &reg,
     );
@@ -929,10 +929,10 @@ fn resolving_with_deep_traps() {
         }
     }
 
-    let reg = registry(reglist.clone());
+    let reg = registry(reglist);
 
     let res = resolve(
-        &pkg_id("root"),
+        pkg_id("root"),
         vec![dep("backtrack_trap0"), dep("cloaking")],
         &reg,
     );
@@ -984,7 +984,7 @@ fn resolving_with_constrained_cousins_backtrack() {
     // but `constrained= "2.0.1"` is already picked.
     // Only then to try and solve `constrained= "~1.0.0"` which is incompatible.
     let res = resolve(
-        &pkg_id("root"),
+        pkg_id("root"),
         vec![
             dep("backtrack_trap0"),
             dep_req("constrained", "2.0.1"),
@@ -1011,10 +1011,10 @@ fn resolving_with_constrained_cousins_backtrack() {
         ]),
     );
 
-    let reg = registry(reglist.clone());
+    let reg = registry(reglist);
 
     let res = resolve(
-        &pkg_id("root"),
+        pkg_id("root"),
         vec![dep("level0"), dep_req("constrained", "2.0.1")],
         &reg,
     );
@@ -1022,7 +1022,7 @@ fn resolving_with_constrained_cousins_backtrack() {
     assert!(res.is_err());
 
     let res = resolve(
-        &pkg_id("root"),
+        pkg_id("root"),
         vec![dep("level0"), dep_req("constrained", "2.0.0")],
         &reg,
     )
@@ -1066,7 +1066,7 @@ fn resolving_with_constrained_sibling_backtrack_activation() {
     }
     let reg = registry(reglist);
 
-    let res = resolve(&pkg_id("root"), vec![dep_req("foo", "1")], &reg).unwrap();
+    let res = resolve(pkg_id("root"), vec![dep_req("foo", "1")], &reg).unwrap();
 
     assert_contains(
         &res,
@@ -1112,7 +1112,7 @@ fn resolving_with_constrained_sibling_transitive_dep_effects() {
         pkg!(("D", "1.0.105")),
     ]);
 
-    let res = resolve(&pkg_id("root"), vec![dep_req("A", "1")], &reg).unwrap();
+    let res = resolve(pkg_id("root"), vec![dep_req("A", "1")], &reg).unwrap();
 
     assert_same(
         &res,
@@ -1158,7 +1158,7 @@ fn incomplete_information_skiping() {
     ];
     let reg = registry(input.clone());
 
-    let res = resolve(&pkg_id("root"), vec![dep("g")], &reg).unwrap();
+    let res = resolve(pkg_id("root"), vec![dep("g")], &reg).unwrap();
     let package_to_yank = "to_yank".to_pkgid();
     // this package is not used in the resolution.
     assert!(!res.contains(&package_to_yank));
@@ -1172,7 +1172,7 @@ fn incomplete_information_skiping() {
     );
     assert_eq!(input.len(), new_reg.len() + 1);
     // it should still build
-    assert!(resolve(&pkg_id("root"), vec![dep("g")], &new_reg).is_ok());
+    assert!(resolve(pkg_id("root"), vec![dep("g")], &new_reg).is_ok());
 }
 
 #[test]
@@ -1227,7 +1227,7 @@ fn incomplete_information_skiping_2() {
     ];
     let reg = registry(input.clone());
 
-    let res = resolve(&pkg_id("root"), vec![dep("i")], &reg).unwrap();
+    let res = resolve(pkg_id("root"), vec![dep("i")], &reg).unwrap();
     let package_to_yank = ("to_yank", "8.8.1").to_pkgid();
     // this package is not used in the resolution.
     assert!(!res.contains(&package_to_yank));
@@ -1241,7 +1241,7 @@ fn incomplete_information_skiping_2() {
     );
     assert_eq!(input.len(), new_reg.len() + 1);
     // it should still build
-    assert!(resolve(&pkg_id("root"), vec![dep("i")], &new_reg).is_ok());
+    assert!(resolve(pkg_id("root"), vec![dep("i")], &new_reg).is_ok());
 }
 
 #[test]
@@ -1277,7 +1277,7 @@ fn incomplete_information_skiping_3() {
     ];
     let reg = registry(input.clone());
 
-    let res = resolve(&pkg_id("root"), vec![dep("b")], &reg).unwrap();
+    let res = resolve(pkg_id("root"), vec![dep("b")], &reg).unwrap();
     let package_to_yank = ("to_yank", "3.0.3").to_pkgid();
     // this package is not used in the resolution.
     assert!(!res.contains(&package_to_yank));
@@ -1291,14 +1291,14 @@ fn incomplete_information_skiping_3() {
     );
     assert_eq!(input.len(), new_reg.len() + 1);
     // it should still build
-    assert!(resolve(&pkg_id("root"), vec![dep("b")], &new_reg).is_ok());
+    assert!(resolve(pkg_id("root"), vec![dep("b")], &new_reg).is_ok());
 }
 
 #[test]
 fn resolving_but_no_exists() {
     let reg = registry(vec![]);
 
-    let res = resolve(&pkg_id("root"), vec![dep_req("foo", "1")], &reg);
+    let res = resolve(pkg_id("root"), vec![dep_req("foo", "1")], &reg);
     assert!(res.is_err());
 
     assert_eq!(
@@ -1315,7 +1315,7 @@ fn resolving_but_no_exists() {
 fn resolving_cycle() {
     let reg = registry(vec![pkg!("foo" => ["foo"])]);
 
-    let _ = resolve(&pkg_id("root"), vec![dep_req("foo", "1")], &reg);
+    let _ = resolve(pkg_id("root"), vec![dep_req("foo", "1")], &reg);
 }
 
 #[test]
@@ -1327,7 +1327,7 @@ fn hard_equality() {
     ]);
 
     let res = resolve(
-        &pkg_id("root"),
+        pkg_id("root"),
         vec![dep_req("bar", "1"), dep_req("foo", "=1.0.0")],
         &reg,
     )
@@ -1365,7 +1365,7 @@ fn large_conflict_cache() {
         }
     }
     let reg = registry(input);
-    let _ = resolve(&pkg_id("root"), root_deps, &reg);
+    let _ = resolve(pkg_id("root"), root_deps, &reg);
 }
 
 #[test]
@@ -1404,6 +1404,6 @@ fn conflict_store_bug() {
         ]),
     ];
 
-    let reg = registry(input.clone());
-    let _ = resolve_and_validated(&pkg_id("root"), vec![dep("j")], &reg);
+    let reg = registry(input);
+    let _ = resolve_and_validated(pkg_id("root"), vec![dep("j")], &reg);
 }
diff --git a/tests/testsuite/support/mod.rs b/tests/testsuite/support/mod.rs
index 8685b48e6bb..305d6642040 100644
--- a/tests/testsuite/support/mod.rs
+++ b/tests/testsuite/support/mod.rs
@@ -515,10 +515,10 @@ pub fn main_file(println: &str, deps: &[&str]) -> String {
     }
 
     buf.push_str("fn main() { println!(");
-    buf.push_str(&println);
+    buf.push_str(println);
     buf.push_str("); }\n");
 
-    buf.to_string()
+    buf
 }
 
 trait ErrMsg<T> {
@@ -926,7 +926,7 @@ impl Execs {
         }
         for &(ref expect, number) in self.expect_stdout_contains_n.iter() {
             self.match_std(
-                Some(&expect),
+                Some(expect),
                 &actual.stdout,
                 "stdout",
                 &actual.stderr,
@@ -1084,10 +1084,7 @@ impl Execs {
 
                 // On Windows, we need to use a wildcard for the drive,
                 // because we don't actually know what it will be.
-                let replaced =
-                    replaced.replace("[ROOT]", if cfg!(windows) { r#"[..]:\"# } else { "/" });
-
-                replaced
+                replaced.replace("[ROOT]", if cfg!(windows) { r#"[..]:\"# } else { "/" })
             }
             None => return Ok(()),
         };
@@ -1246,7 +1243,7 @@ impl Execs {
             .enumerate()
             .filter_map(|(i, (a, e))| match (a, e) {
                 (Some(a), Some(e)) => {
-                    if lines_match(&e, &a) {
+                    if lines_match(e, a) {
                         None
                     } else {
                         Some(format!("{:3} - |{}|\n    + |{}|\n", i, e, a))
@@ -1327,7 +1324,7 @@ fn lines_match_works() {
 /// arbitrary nested JSON (useful for parts of object emitted by other programs
 /// (e.g., rustc) rather than Cargo itself). Arrays are sorted before comparison.
 pub fn find_json_mismatch(expected: &Value, actual: &Value) -> Result<(), String> {
-    match find_json_mismatch_r(expected, &actual) {
+    match find_json_mismatch_r(expected, actual) {
         Some((expected_part, actual_part)) => Err(format!(
             "JSON mismatch\nExpected:\n{}\nWas:\n{}\nExpected part:\n{}\nActual part:\n{}\n",
             serde_json::to_string_pretty(expected).unwrap(),
@@ -1368,7 +1365,7 @@ fn find_json_mismatch_r<'a>(
 
             if !l.is_empty() {
                 assert!(!r.is_empty());
-                Some((&l[0], &r[0]))
+                Some((l[0], r[0]))
             } else {
                 assert_eq!(r.len(), 0);
                 None
diff --git a/tests/testsuite/support/resolver.rs b/tests/testsuite/support/resolver.rs
index 3b506ed3466..bce8c317e81 100644
--- a/tests/testsuite/support/resolver.rs
+++ b/tests/testsuite/support/resolver.rs
@@ -21,7 +21,7 @@ use proptest::string::string_regex;
 use proptest::test_runner::TestRunner;
 
 pub fn resolve(
-    pkg: &PackageId,
+    pkg: PackageId,
     deps: Vec<Dependency>,
     registry: &[Summary],
 ) -> CargoResult<Vec<PackageId>> {
@@ -29,17 +29,17 @@ pub fn resolve(
 }
 
 pub fn resolve_and_validated(
-    pkg: &PackageId,
+    pkg: PackageId,
     deps: Vec<Dependency>,
     registry: &[Summary],
 ) -> CargoResult<Vec<PackageId>> {
     let resolve = resolve_with_config_raw(pkg, deps, registry, None)?;
-    let mut stack = vec![pkg.clone()];
+    let mut stack = vec![pkg];
     let mut used = HashSet::new();
     let mut links = HashSet::new();
     while let Some(p) = stack.pop() {
         assert!(resolve.contains(&p));
-        if used.insert(p.clone()) {
+        if used.insert(p) {
             // in the tests all `links` crates end in `-sys`
             if p.name().ends_with("-sys") {
                 assert!(links.insert(p.name()));
@@ -48,7 +48,7 @@ pub fn resolve_and_validated(
                 for d in deps {
                     assert!(d.matches_id(dp));
                 }
-                dp.clone()
+                dp
             }));
         }
     }
@@ -58,7 +58,7 @@ pub fn resolve_and_validated(
 }
 
 pub fn resolve_with_config(
-    pkg: &PackageId,
+    pkg: PackageId,
     deps: Vec<Dependency>,
     registry: &[Summary],
     config: Option<&Config>,
@@ -68,7 +68,7 @@ pub fn resolve_with_config(
 }
 
 pub fn resolve_with_config_raw(
-    pkg: &PackageId,
+    pkg: PackageId,
     deps: Vec<Dependency>,
     registry: &[Summary],
     config: Option<&Config>,
@@ -99,7 +99,7 @@ pub fn resolve_with_config_raw(
     }
     let mut registry = MyRegistry(registry);
     let summary = Summary::new(
-        pkg.clone(),
+        pkg,
         deps,
         &BTreeMap::<String, Vec<String>>::new(),
         None::<String>,
@@ -146,7 +146,7 @@ pub trait ToPkgId {
 
 impl ToPkgId for PackageId {
     fn to_pkgid(&self) -> PackageId {
-        self.clone()
+        *self
     }
 }
 
@@ -461,7 +461,7 @@ pub fn registry_strategy(
                     let (c, d) = order_index(c, d, s.len());
 
                     dependency_by_pkgid[b].push(dep_req_kind(
-                        &dep_name,
+                        dep_name,
                         &if c == 0 && d == s_last_index {
                             "*".to_string()
                         } else if c == 0 {
@@ -525,7 +525,7 @@ fn meta_test_deep_trees_from_strategy() {
         let reg = registry(input.clone());
         for this in input.iter().rev().take(10) {
             let res = resolve(
-                &pkg_id("root"),
+                pkg_id("root"),
                 vec![dep_req(&this.name(), &format!("={}", this.version()))],
                 &reg,
             );
@@ -564,7 +564,7 @@ fn meta_test_multiple_versions_strategy() {
         let reg = registry(input.clone());
         for this in input.iter().rev().take(10) {
             let res = resolve(
-                &pkg_id("root"),
+                pkg_id("root"),
                 vec![dep_req(&this.name(), &format!("={}", this.version()))],
                 &reg,
             );
diff --git a/tests/testsuite/tool_paths.rs b/tests/testsuite/tool_paths.rs
index e6ad68198c7..7cb91d2426f 100644
--- a/tests/testsuite/tool_paths.rs
+++ b/tests/testsuite/tool_paths.rs
@@ -188,13 +188,11 @@ fn custom_runner_cfg() {
 
     p.cargo("run -- --param")
         .with_status(101)
-        .with_stderr_contains(&format!(
-            "\
+        .with_stderr_contains("\
 [COMPILING] foo v0.0.1 ([CWD])
 [FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
 [RUNNING] `nonexistent-runner -r target/debug/foo[EXE] --param`
-",
-        ))
+")
         .run();
 }
 
@@ -222,13 +220,11 @@ fn custom_runner_cfg_precedence() {
 
     p.cargo("run -- --param")
         .with_status(101)
-        .with_stderr_contains(&format!(
-            "\
+        .with_stderr_contains("\
             [COMPILING] foo v0.0.1 ([CWD])
 [FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
 [RUNNING] `nonexistent-runner -r target/debug/foo[EXE] --param`
-",
-        ))
+")
         .run();
 }
 
@@ -250,10 +246,8 @@ fn custom_runner_cfg_collision() {
 
     p.cargo("run -- --param")
         .with_status(101)
-        .with_stderr_contains(&format!(
-            "\
+        .with_stderr_contains("\
 [ERROR] several matching instances of `target.'cfg(..)'.runner` in `.cargo/config`
-",
-        ))
+")
         .run();
 }