about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2018-05-15 20:18:13 +0000
committerbors <bors@rust-lang.org>2018-05-15 20:18:13 +0000
commitf0fdaba04ea7474cd1f66264ef4edb3485a95864 (patch)
treed669bc09d6c2587a0e92263362c4a9019000a996
parent27acb9b3c033e1dd74cc72310a5a346527d3e704 (diff)
parent0370c388956e0cc8c5ef50478e1a03b39531e65b (diff)
downloadrust-f0fdaba04ea7474cd1f66264ef4edb3485a95864.tar.gz
rust-f0fdaba04ea7474cd1f66264ef4edb3485a95864.zip
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
-rw-r--r--src/bootstrap/tool.rs9
1 files changed, 0 insertions, 9 deletions
diff --git a/src/bootstrap/tool.rs b/src/bootstrap/tool.rs
index 220af6bd6e4..4b6e266f1e5 100644
--- a/src/bootstrap/tool.rs
+++ b/src/bootstrap/tool.rs
@@ -556,15 +556,6 @@ tool_extended!((self, builder),
     };
     Miri, miri, "src/tools/miri", "miri", {};
     Rls, rls, "src/tools/rls", "rls", {
-        let clippy = builder.ensure(Clippy {
-            compiler: self.compiler,
-            target: self.target,
-            extra_features: Vec::new(),
-        });
-        let channel = &builder.config.channel;
-        if clippy.is_some() && channel != "stable" && channel != "beta" {
-            self.extra_features.push("clippy".to_owned());
-        }
         builder.ensure(native::Openssl {
             target: self.target,
         });