diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2021-01-14 11:31:10 +0000 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-01-14 11:31:10 +0000 |
| commit | e732b948e9d7a32b644a45cd0a67ff9514879ece (patch) | |
| tree | abbfb9f76762b6c1e26ee0e4d5c9156f8b310799 /crates/project_model | |
| parent | d76143da19fcfcd210acc930e68acd6c43db9088 (diff) | |
| parent | 47c5ec4b94bcf114cee333c8a07ef6f4f5e9b72b (diff) | |
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 <[email protected]>
Diffstat (limited to 'crates/project_model')
| -rw-r--r-- | crates/project_model/src/cargo_workspace.rs | 2 |
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 2ee4e88b2..a1ab9c6db 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( | |||
| 377 | progress: &dyn Fn(String), | 377 | progress: &dyn Fn(String), |
| 378 | ) -> Result<ExternResources> { | 378 | ) -> Result<ExternResources> { |
| 379 | let mut cmd = Command::new(toolchain::cargo()); | 379 | let mut cmd = Command::new(toolchain::cargo()); |
| 380 | cmd.args(&["check", "--message-format=json", "--manifest-path"]).arg(cargo_toml); | 380 | cmd.args(&["check", "--workspace", "--message-format=json", "--manifest-path"]).arg(cargo_toml); |
| 381 | 381 | ||
| 382 | // --all-targets includes tests, benches and examples in addition to the | 382 | // --all-targets includes tests, benches and examples in addition to the |
| 383 | // default lib and bins. This is an independent concept from the --targets | 383 | // default lib and bins. This is an independent concept from the --targets |