Auto merge of #7135 - ehuss:clippy-fixes, r=Eh2406

Fix some clippy warnings.

src/bin/cargo/cli.rs

@@ -19,7 +19,7 @@ pub fn main(config: &mut Config) -> CliResult {
                 return super::execute_external_subcommand(config, cmd, &[cmd, "--help"])
                     .map_err(|_| e.into());
             } else {
-                return Err(e)?;
+                return Err(e.into());
             }
         }
     };

src/bin/cargo/commands/install.rs

@@ -153,9 +153,10 @@ pub fn exec(config: &mut Config, args: &ArgMatches<'_>) -> CliResult {
     let root = args.value_of("root");
 
     if args.is_present("no-track") && !config.cli_unstable().install_upgrade {
-        Err(failure::format_err!(
+        return Err(failure::format_err!(
             "`--no-track` flag is unstable, pass `-Z install-upgrade` to enable it"
-        ))?;
+        )
+        .into());
     };
 
     if args.is_present("list") {

src/cargo/core/compiler/fingerprint.rs

@@ -1577,7 +1577,7 @@ pub fn translate_dep_info(
             (DepInfoPathType::TargetRootRelative, &*file)
         };
         new_contents.push(ty as u8);
-        new_contents.extend(util::path2bytes(&path)?);
+        new_contents.extend(util::path2bytes(path)?);
         new_contents.push(0);
     }
     paths::write(cargo_dep_info, &new_contents)?;

src/cargo/ops/cargo_package.rs

@@ -39,7 +39,7 @@ pub struct PackageOpts<'cfg> {
     pub no_default_features: bool,
 }
 
-static VCS_INFO_FILE: &'static str = ".cargo_vcs_info.json";
+static VCS_INFO_FILE: &str = ".cargo_vcs_info.json";
 
 pub fn package(ws: &Workspace<'_>, opts: &PackageOpts<'_>) -> CargoResult<Option<FileLock>> {
     if ws.root().join("Cargo.lock").exists() {

src/cargo/util/command_prelude.rs

@@ -515,8 +515,8 @@ pub enum CommandInfo {
 impl CommandInfo {
     pub fn name(&self) -> &str {
         match self {
-            CommandInfo::BuiltIn { name, .. } => &name,
-            CommandInfo::External { name, .. } => &name,
+            CommandInfo::BuiltIn { name, .. } => name,
+            CommandInfo::External { name, .. } => name,
         }
     }
 }

src/cargo/util/toml/mod.rs

@@ -1058,7 +1058,7 @@ impl TomlManifest {
                 .any(|t| t.name() == run)
             {
                 let suggestion =
-                    util::closest_msg(&run, targets.iter().filter(|t| t.is_bin()), |t| t.name());
+                    util::closest_msg(run, targets.iter().filter(|t| t.is_bin()), |t| t.name());
                 bail!("default-run target `{}` not found{}", run, suggestion);
             }
         }

src/cargo/util/workspace.rs

@@ -46,7 +46,7 @@ fn print_available(
             writeln!(output, "    {}", target.name())?;
         }
     }
-    Err(failure::err_msg(output))?
+    Err(failure::err_msg(output))
 }
 
 pub fn print_available_examples(

tests/testsuite/read_manifest.rs

@@ -1,6 +1,6 @@
 use crate::support::{basic_bin_manifest, main_file, project};
 
-static MANIFEST_OUTPUT: &'static str = r#"
+static MANIFEST_OUTPUT: &str = r#"
 {
     "authors": [
         "wycats@example.com"

tests/testsuite/support/mod.rs

@@ -1033,12 +1033,12 @@ impl Execs {
             );
 
             if let (Err(_), Err(_)) = (match_std, match_err) {
-                Err(format!(
+                return Err(format!(
                     "expected to find:\n\
                      {}\n\n\
                      did not find in either output.",
                     expect
-                ))?;
+                ));
             }
         }
 

tests/testsuite/support/paths.rs

@@ -10,7 +10,7 @@ use std::sync::Mutex;
 use filetime::{self, FileTime};
 use lazy_static::lazy_static;
 
-static CARGO_INTEGRATION_TEST_DIR: &'static str = "cit";
+static CARGO_INTEGRATION_TEST_DIR: &str = "cit";
 
 lazy_static! {
     static ref GLOBAL_ROOT: PathBuf = {

tests/testsuite/test.rs

@@ -3062,17 +3062,8 @@ fn cargo_test_env() {
 
     let cargo = cargo_exe().canonicalize().unwrap();
     p.cargo("test --lib -- --nocapture")
-        .with_stderr_contains(format!(
-            "\
-{}
-",
-            cargo.to_str().unwrap()
-        ))
-        .with_stdout_contains(format!(
-            "\
-test env_test ... ok
-",
-        ))
+        .with_stderr_contains(cargo.to_str().unwrap())
+        .with_stdout_contains("test env_test ... ok")
         .run();
 }
 

tests/testsuite/warn_on_failure.rs

@@ -1,8 +1,8 @@
 use crate::support::registry::Package;
 use crate::support::{project, Project};
 
-static WARNING1: &'static str = "Hello! I'm a warning. :)";
-static WARNING2: &'static str = "And one more!";
+static WARNING1: &str = "Hello! I'm a warning. :)";
+static WARNING2: &str = "And one more!";
 
 fn make_lib(lib_src: &str) {
     Package::new("bar", "0.0.1")