Merge pull request #3338 from hi-rustin/rustin-patch-clippy-tip

Suggest right toolchain when running clippy

Author: rbtcollins

CONTRIBUTING.md

@@ -72,7 +72,7 @@ clippy is a moving target that can make it hard to merge for little benefit.
 
 We do ask that contributors keep the clippy status clean themselves.
 
-Minimally, run `cargo +nightly clippy --all --all-targets -- -D warnings` before
+Minimally, run `cargo +beta clippy --all --all-targets -- -D warnings` before
 submitting code.
 
 If possible, adding `--all-features` to the command is useful, but will require

tests/suite/cli_rustup.rs

@@ -583,7 +583,7 @@ fn recursive_cargo() {
             let cargo_bin_path = config.cargodir.join("bin");
             let cargo_subcommand = cargo_bin_path.join(format!("cargo-foo{}", EXE_SUFFIX));
             fs::create_dir_all(&cargo_bin_path).unwrap();
-            fs::copy(&real_mock_cargo, &cargo_subcommand).unwrap();
+            fs::copy(real_mock_cargo, cargo_subcommand).unwrap();
 
             // Verify the default behavior, which is currently broken on Windows.
             let args = &["cargo", "--recursive-cargo-subcommand"];