diff options
| author | bors <bors@rust-lang.org> | 2020-09-10 14:55:17 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-09-10 14:55:17 +0000 |
| commit | fd42ab4dabbf361abb3925dbebc2c4025280181b (patch) | |
| tree | 1eb129387a9c3065dba4463c77f3924b88544250 | |
| parent | 5034d47f721ff4c3a3ff2aca9ef2ef3e1d067f9f (diff) | |
| parent | 46b164313288c4b5454ccdaa5ebee2412855f0fd (diff) | |
| download | rust-fd42ab4dabbf361abb3925dbebc2c4025280181b.tar.gz rust-fd42ab4dabbf361abb3925dbebc2c4025280181b.zip | |
Auto merge of #6020 - matthiaskrgr:ra_dev_setup_update, r=flip1995
update cargo dev ra-setup to changed rustc source paths changelog: none
| -rw-r--r-- | clippy_dev/src/ra_setup.rs | 4 |
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() ) |