about summary refs log tree commit diff
diff options
context:
space:
mode:
authorflip1995 <philipp.krones@embecosm.com>2021-02-05 17:23:04 +0100
committerflip1995 <philipp.krones@embecosm.com>2021-02-05 17:23:04 +0100
commit79dbf10736defbfee05ba95083ba6e2a012f6cef (patch)
treed08a36cdbeaa3c57f53c951e9b91afd4a9650484
parent357c6a7e2739da8c8d0a68a5e9e0867983af7cbe (diff)
downloadrust-79dbf10736defbfee05ba95083ba6e2a012f6cef.tar.gz
rust-79dbf10736defbfee05ba95083ba6e2a012f6cef.zip
Use absolute path to Rust repo in ra_setup
This will convert the path to the Rust repo to an absolute path. This is
important for the clippy_lints/Cargo.toml file. Otherwise if a relative
path is passed, rst-analyzer won't find the Rust repo, because it starts
the relative path search from the clippy_lints dir, not the
rust-clippy dir where the ra_setup command was run from.
-rw-r--r--clippy_dev/src/ra_setup.rs4
1 files changed, 3 insertions, 1 deletions
diff --git a/clippy_dev/src/ra_setup.rs b/clippy_dev/src/ra_setup.rs
index a3c329b578b..d0e2193ddc5 100644
--- a/clippy_dev/src/ra_setup.rs
+++ b/clippy_dev/src/ra_setup.rs
@@ -13,7 +13,9 @@ use std::path::{Path, PathBuf};
 /// Panics if `rustc_path` does not lead to a rustc repo or the files could not be read
 pub fn run(rustc_path: Option<&str>) {
     // we can unwrap here because the arg is required by clap
-    let rustc_path = PathBuf::from(rustc_path.unwrap());
+    let rustc_path = PathBuf::from(rustc_path.unwrap())
+        .canonicalize()
+        .expect("failed to get the absolute repo path");
     assert!(rustc_path.is_dir(), "path is not a directory");
     let rustc_source_basedir = rustc_path.join("compiler");
     assert!(