Merge #681

681: Use the correct working directory for cargo metadata and rustfmt r=matklad a=DJMcNab

Fixes maybe #670. @bjorn3, is that true?

(Awkward wording due to GitHub's eager 'fixes' finding)

Co-authored-by: DJMcNab <[email protected]>

1 files changed, 7 insertions, 3 deletions

diff --git a/crates/ra_lsp_server/src/project_model/cargo_workspace.rs b/crates/ra_lsp_server/src/project_model/cargo_workspace.rs
index 75ae78bca..8cf99d586 100644
--- a/crates/ra_lsp_server/src/project_model/cargo_workspace.rs
+++ b/crates/ra_lsp_server/src/project_model/cargo_workspace.rs
@@ -117,9 +117,13 @@ impl Target {
 
 impl CargoWorkspace {
     pub fn from_cargo_metadata(cargo_toml: &Path) -> Result<CargoWorkspace> {
-        let meta = MetadataCommand::new()
-            .manifest_path(cargo_toml)
-            .features(CargoOpt::AllFeatures)
+        let mut meta = MetadataCommand::new();
+        meta.manifest_path(cargo_toml)
+            .features(CargoOpt::AllFeatures);
+        if let Some(parent) = cargo_toml.parent() {
+            meta.current_dir(parent);
+        }
+        let meta = meta
             .exec()
             .map_err(|e| format_err!("cargo metadata failed: {}", e))?;
         let mut pkg_by_id = FxHashMap::default();