Rollup merge of #56699 - nnethercote:SymbolIndex, r=oli-obk

[rust.git] / Cargo.toml

diff --git a/Cargo.toml b/Cargo.toml
index 1e1d7a40967b34f629eb60e5f0d2f978b272aebd..667c55791bd171dbe31735a7af288a6eba308563 100644 (file)
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -26,6 +26,9 @@ members = [
 ]
 exclude = [
   "src/tools/rls/test_data",
+  "build",
+  # HACK(eddyb) This hardcodes the fact that our CI uses `/checkout/obj`.
+  "obj",
 ]
 
 # Curiously, LLVM 7.0 will segfault if compiled with opt-level=3
@@ -62,6 +65,10 @@ rustfmt-nightly = { path = "src/tools/rustfmt" }
 # here
 rustc-workspace-hack = { path = 'src/tools/rustc-workspace-hack' }
 
-[patch."https://github.com/rust-lang-nursery/rust-clippy"]
+# See comments in `tools/rustc-std-workspace-core/README.md` for what's going on
+# here
+rustc-std-workspace-core = { path = 'src/tools/rustc-std-workspace-core' }
+
+[patch."https://github.com/rust-lang/rust-clippy"]
 clippy_lints = { path = "src/tools/clippy/clippy_lints" }
 rustc_tools_util = { path = "src/tools/clippy/rustc_tools_util" }