diff options
| author | kennytm <kennytm@gmail.com> | 2018-04-14 15:22:06 +0800 |
|---|---|---|
| committer | kennytm <kennytm@gmail.com> | 2018-04-14 15:22:06 +0800 |
| commit | c22b4db0f5e17e18f1099a803945cb0e96ac3c56 (patch) | |
| tree | 307b98589f02f67d8e36f559aebb593f2733997d | |
| parent | 642bcc488b4203656a7f6ac6a7c4fc5d7e901406 (diff) | |
| parent | 34956c8e8e9c5cda3020de052d0c6e76895d4472 (diff) | |
| download | rust-c22b4db0f5e17e18f1099a803945cb0e96ac3c56.tar.gz rust-c22b4db0f5e17e18f1099a803945cb0e96ac3c56.zip | |
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
| -rw-r--r-- | src/bootstrap/tool.rs | 3 |
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 { |