commit ba1d3c3fb0450bcaf8f20be61a4cd475a5e1a5e2
author Lukas Wirth <lukastw97@gmail.com> Wed May 03 20:41:06 2023 +0200
committer GitHub <noreply@github.com> Wed May 03 20:41:06 2023 +0200
tree 6df3be0271be30d8ed301459bbe5caf1aeabff20
parent 60f4b3e26e8656bbe8b65530e237e3907c9565f3

Revert "fix: Canonicalize rust-project.json manifest path"

crates/paths/src/lib.rs

diff --git a/crates/paths/src/lib.rs b/crates/paths/src/lib.rs
index 083dfcf..d56d2d5 100644
--- a/crates/paths/src/lib.rs
+++ b/crates/paths/src/lib.rs
@@ -166,11 +166,6 @@
         AbsPathBuf::try_from(self.0.to_path_buf()).unwrap()
     }
 
-    /// Equivalent of [`Path::canonicalize`] for `AbsPath`.
-    pub fn canonicalize(&self) -> Result<AbsPathBuf, std::io::Error> {
-        Ok(self.as_ref().canonicalize()?.try_into().unwrap())
-    }
-
     /// Equivalent of [`Path::strip_prefix`] for `AbsPath`.
     ///
     /// Returns a relative path.

crates/project-model/src/manifest_path.rs

diff --git a/crates/project-model/src/manifest_path.rs b/crates/project-model/src/manifest_path.rs
index d675411..980d92d 100644
--- a/crates/project-model/src/manifest_path.rs
+++ b/crates/project-model/src/manifest_path.rs
@@ -34,11 +34,6 @@
     pub fn parent(&self) -> &AbsPath {
         self.file.parent().unwrap()
     }
-
-    /// Equivalent of [`Path::canonicalize`] for `ManifestPath`.
-    pub fn canonicalize(&self) -> Result<ManifestPath, std::io::Error> {
-        Ok((&**self).canonicalize()?.try_into().unwrap())
-    }
 }
 
 impl ops::Deref for ManifestPath {

crates/project-model/src/workspace.rs

diff --git a/crates/project-model/src/workspace.rs b/crates/project-model/src/workspace.rs
index bfd2cab..e758464 100644
--- a/crates/project-model/src/workspace.rs
+++ b/crates/project-model/src/workspace.rs
@@ -4,7 +4,7 @@
 
 use std::{collections::VecDeque, fmt, fs, process::Command, sync};
 
-use anyhow::{format_err, Context, Result};
+use anyhow::{bail, format_err, Context, Result};
 use base_db::{
     CrateDisplayName, CrateGraph, CrateId, CrateName, CrateOrigin, Dependency, Edition, Env,
     FileId, LangCrateOrigin, ProcMacroPaths, ReleaseChannel, TargetLayoutLoadResult,
@@ -179,7 +179,12 @@
         };
         let res = match manifest {
             ProjectManifest::ProjectJson(project_json) => {
-                let project_json = project_json.canonicalize()?;
+                let metadata = fs::symlink_metadata(&project_json).with_context(|| {
+                    format!("Failed to read json file {}", project_json.display())
+                })?;
+                if metadata.is_symlink() {
+                    bail!("The project-json may not currently point to a symlink");
+                }
                 let file = fs::read_to_string(&project_json).with_context(|| {
                     format!("Failed to read json file {}", project_json.display())
                 })?;