]> git.lizzy.rs Git - rust.git/commitdiff
Don't inject clippy into the rls anymore
authorOliver Schneider <git-no-reply-9879165716479413131@oli-obk.de>
Tue, 15 May 2018 09:34:24 +0000 (11:34 +0200)
committerOliver Schneider <git-no-reply-9879165716479413131@oli-obk.de>
Tue, 15 May 2018 09:34:24 +0000 (11:34 +0200)
src/bootstrap/tool.rs

index 220af6bd6e4af02b7c8df1f64a7f427379b1c1ab..4b6e266f1e55c5ec35c60fc1370be789a1b97740 100644 (file)
@@ -556,15 +556,6 @@ fn run(mut $sel, $builder: &Builder) -> Option<PathBuf> {
     };
     Miri, miri, "src/tools/miri", "miri", {};
     Rls, rls, "src/tools/rls", "rls", {
-        let clippy = builder.ensure(Clippy {
-            compiler: self.compiler,
-            target: self.target,
-            extra_features: Vec::new(),
-        });
-        let channel = &builder.config.channel;
-        if clippy.is_some() && channel != "stable" && channel != "beta" {
-            self.extra_features.push("clippy".to_owned());
-        }
         builder.ensure(native::Openssl {
             target: self.target,
         });