Merge #825
825: Remove call to canonicalize in BatchDatabase::load_cargo r=matklad a=vipentti 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. Co-authored-by: Ville Penttinen <villem.penttinen@gmail.com>
This commit is contained in:
commit
b85c189500
@ -95,7 +95,7 @@ impl BatchDatabase {
|
||||
}
|
||||
|
||||
pub fn load_cargo(root: impl AsRef<Path>) -> Result<(BatchDatabase, Vec<SourceRootId>)> {
|
||||
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());
|
||||
|
Loading…
x
Reference in New Issue
Block a user