about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorOliver Schneider <git-no-reply-9879165716479413131@oli-obk.de>2018-04-11 14:56:59 +0200
committerOliver Schneider <git-no-reply-9879165716479413131@oli-obk.de>2018-04-11 14:56:59 +0200
commit34956c8e8e9c5cda3020de052d0c6e76895d4472 (patch)
treef93418922e649f4b6e554c17fe188d85814f95e3 /src
parentca26ef321c44358404ef788d315c4557eb015fb2 (diff)
downloadrust-34956c8e8e9c5cda3020de052d0c6e76895d4472.tar.gz
rust-34956c8e8e9c5cda3020de052d0c6e76895d4472.zip
Don't inject clippy into rls on stable/beta
Diffstat (limited to 'src')
-rw-r--r--src/bootstrap/tool.rs3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/bootstrap/tool.rs b/src/bootstrap/tool.rs
index 5fc92611e65..97507bc0869 100644
--- a/src/bootstrap/tool.rs
+++ b/src/bootstrap/tool.rs
@@ -564,7 +564,8 @@ tool_extended!((self, builder),
             target: self.target,
             extra_features: Vec::new(),
         });
-        if clippy.is_some() {
+        let channel = &builder.config.channel;
+        if clippy.is_some() && channel != "stable" && channel != "beta" {
             self.extra_features.push("clippy".to_owned());
         }
         builder.ensure(native::Openssl {