about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2021-01-14 11:31:10 +0000
committerGitHub <noreply@github.com>2021-01-14 11:31:10 +0000
commite732b948e9d7a32b644a45cd0a67ff9514879ece (patch)
treeabbfb9f76762b6c1e26ee0e4d5c9156f8b310799
parentd76143da19fcfcd210acc930e68acd6c43db9088 (diff)
parent47c5ec4b94bcf114cee333c8a07ef6f4f5e9b72b (diff)
downloadrust-e732b948e9d7a32b644a45cd0a67ff9514879ece.tar.gz
rust-e732b948e9d7a32b644a45cd0a67ff9514879ece.zip
Merge #7264
7264: Use --workspace when loading extern resources r=edwin0cheng a=chinedufn

https://github.com/rust-analyzer/rust-analyzer/issues/5040#issuecomment-759853153

Co-authored-by: Chinedu Francis Nwafili <frankie.nwafili@gmail.com>
-rw-r--r--crates/project_model/src/cargo_workspace.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/crates/project_model/src/cargo_workspace.rs b/crates/project_model/src/cargo_workspace.rs
index 2ee4e88b2e0..a1ab9c6db57 100644
--- a/crates/project_model/src/cargo_workspace.rs
+++ b/crates/project_model/src/cargo_workspace.rs
@@ -377,7 +377,7 @@ pub(crate) fn load_extern_resources(
     progress: &dyn Fn(String),
 ) -> Result<ExternResources> {
     let mut cmd = Command::new(toolchain::cargo());
-    cmd.args(&["check", "--message-format=json", "--manifest-path"]).arg(cargo_toml);
+    cmd.args(&["check", "--workspace", "--message-format=json", "--manifest-path"]).arg(cargo_toml);
 
     // --all-targets includes tests, benches and examples in addition to the
     // default lib and bins. This is an independent concept from the --targets