From f7a78b284617cf5a6343614cbe85b8bde1e1e68e Mon Sep 17 00:00:00 2001 From: Ville Penttinen Date: Thu, 14 Feb 2019 10:42:40 +0200 Subject: Remove call to canonicalize in BatchDatabase::load_cargo Instead of using canonicalize, we now join the given path to `std::env::current_dir()`, which either replaces the path, if the given path is absolute, or joins the paths. This fixes #821. --- crates/ra_batch/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'crates/ra_batch') diff --git a/crates/ra_batch/src/lib.rs b/crates/ra_batch/src/lib.rs index 837fff4dc..d08fad908 100644 --- a/crates/ra_batch/src/lib.rs +++ b/crates/ra_batch/src/lib.rs @@ -95,7 +95,7 @@ impl BatchDatabase { } pub fn load_cargo(root: impl AsRef) -> Result<(BatchDatabase, Vec)> { - let root = root.as_ref().canonicalize()?; + let root = std::env::current_dir()?.join(root); let ws = ProjectWorkspace::discover(root.as_ref())?; let mut roots = Vec::new(); roots.push(root.clone()); -- cgit v1.2.3