Skip to content

Commit

Permalink
Rollup merge of rust-lang#49876 - oli-obk:no_secret_clippy_on_stable_…
Browse files Browse the repository at this point in the history
…☹, r=nrc

Don't inject clippy into rls on stable/beta

as discussed at the all-hands
  • Loading branch information
kennytm committed Apr 14, 2018
2 parents 642bcc4 + 34956c8 commit c22b4db
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion src/bootstrap/tool.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down

0 comments on commit c22b4db

Please sign in to comment.