about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMatthias Krüger <matthias.krueger@famsik.de>2020-09-09 11:57:30 +0200
committerMatthias Krüger <matthias.krueger@famsik.de>2020-09-09 11:57:30 +0200
commit46b164313288c4b5454ccdaa5ebee2412855f0fd (patch)
tree67589e5d231d3486d4c1002c0e9d8bfda0a1d6b1
parent8b54f1e2d93c1dc43853578387fe1e1b7d58a3e6 (diff)
downloadrust-46b164313288c4b5454ccdaa5ebee2412855f0fd.tar.gz
rust-46b164313288c4b5454ccdaa5ebee2412855f0fd.zip
update cargo dev ra-setup to changed rustc source paths
-rw-r--r--clippy_dev/src/ra_setup.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/clippy_dev/src/ra_setup.rs b/clippy_dev/src/ra_setup.rs
index f2bd651ab25..c67efc10f15 100644
--- a/clippy_dev/src/ra_setup.rs
+++ b/clippy_dev/src/ra_setup.rs
@@ -14,7 +14,7 @@ pub fn run(rustc_path: Option<&str>) {
     // we can unwrap here because the arg is required here
     let rustc_path = PathBuf::from(rustc_path.unwrap());
     assert!(rustc_path.is_dir(), "path is not a directory");
-    let rustc_source_basedir = rustc_path.join("src");
+    let rustc_source_basedir = rustc_path.join("compiler");
     assert!(
         rustc_source_basedir.is_dir(),
         "are you sure the path leads to a rustc repo?"
@@ -61,7 +61,7 @@ fn inject_deps_into_manifest(
     let new_deps = extern_crates.map(|dep| {
         // format the dependencies that are going to be put inside the Cargo.toml
         format!(
-            "{dep} = {{ path = \"{source_path}/lib{dep}\" }}\n",
+            "{dep} = {{ path = \"{source_path}/{dep}\" }}\n",
             dep = dep,
             source_path = rustc_source_dir.display()
         )