Merge remote-tracking branch 'upstream/beta' into backport_remerge

[rust.git] / src / main.rs

diff --git a/src/main.rs b/src/main.rs
index 12bb909e15afb9a52aa1c6f3c9eeb63aa9b08780..7bb80b1196e5900dd2169a91e6d7ab5977c918d6 100644 (file)
--- a/src/main.rs
+++ b/src/main.rs
@@ -92,12 +92,6 @@ fn new<I>(mut old_args: I) -> Self
             panic!("Usage of `--fix` requires `-Z unstable-options`");
         }
 
-        // Run the dogfood tests directly on nightly cargo. This is required due
-        // to a bug in rustup.rs when running cargo on custom toolchains. See issue #3118.
-        if env::var_os("CLIPPY_DOGFOOD").is_some() && cfg!(windows) {
-            args.insert(0, "+nightly".to_string());
-        }
-
         let mut clippy_args: Vec<String> = old_args.collect();
         if cargo_subcommand == "fix" && !clippy_args.iter().any(|arg| arg == "--no-deps") {
             clippy_args.push("--no-deps".into());
@@ -185,7 +179,7 @@ mod tests {
     #[should_panic]
     fn fix_without_unstable() {
         let args = "cargo clippy --fix".split_whitespace().map(ToString::to_string);
-        let _ = ClippyCmd::new(args);
+        ClippyCmd::new(args);
     }
 
     #[test]