Skip to content

Commit f0fdaba

Browse files
committed
Auto merge of #50767 - oli-obk:rls_clippy, r=kennytm
Don't inject clippy into the rls anymore r? @kennytm sorry about breaking nightlies. The issue is that the `[patch.crates-io]` doesn't work if the versions differ. So every time we update clippy, we can only update it to the verison that rls is depending on. I'm disabling the injection of clippy into rls for now. I'm not sure how to do this properly. We could * add a version check, so rls only builds clippy if its dependency clippy is the same as the submodule clippy * do something crazy like auto-patching the Cargo.toml of the rls tool repo to just use a path dependency on clippy * build crates-io clippy instead of submodule clippy and gate clippy injection on that * that's somewhat automatic, and is essentially what is necessary right now, but done manually * make clippy 0.1.* instead of 0.0.* and update patch versions for nightly updates and minor version updates for `clippy_lints` api changes. * not sure how semver-great this is
2 parents 27acb9b + 0370c38 commit f0fdaba

File tree

1 file changed

+0
-9
lines changed

1 file changed

+0
-9
lines changed

src/bootstrap/tool.rs

-9
Original file line numberDiff line numberDiff line change
@@ -556,15 +556,6 @@ tool_extended!((self, builder),
556556
};
557557
Miri, miri, "src/tools/miri", "miri", {};
558558
Rls, rls, "src/tools/rls", "rls", {
559-
let clippy = builder.ensure(Clippy {
560-
compiler: self.compiler,
561-
target: self.target,
562-
extra_features: Vec::new(),
563-
});
564-
let channel = &builder.config.channel;
565-
if clippy.is_some() && channel != "stable" && channel != "beta" {
566-
self.extra_features.push("clippy".to_owned());
567-
}
568559
builder.ensure(native::Openssl {
569560
target: self.target,
570561
});

0 commit comments

Comments
 (0)