Skip to content

Commit c22b4db

Browse files
committed
Rollup merge of rust-lang#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
2 parents 642bcc4 + 34956c8 commit c22b4db

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

src/bootstrap/tool.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -564,7 +564,8 @@ tool_extended!((self, builder),
564564
target: self.target,
565565
extra_features: Vec::new(),
566566
});
567-
if clippy.is_some() {
567+
let channel = &builder.config.channel;
568+
if clippy.is_some() && channel != "stable" && channel != "beta" {
568569
self.extra_features.push("clippy".to_owned());
569570
}
570571
builder.ensure(native::Openssl {

0 commit comments

Comments
 (0)