Rollup merge of #49876 - oli-obk:no_secret_clippy_on_stable_☹, r=nrc

Don't inject clippy into rls on stable/beta

as discussed at the all-hands
This commit is contained in:
kennytm 2018-04-14 15:22:06 +08:00
commit c22b4db0f5
No known key found for this signature in database
GPG Key ID: FEF6C8051D0E013C
1 changed files with 2 additions and 1 deletions

View File

@ -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 {