about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2023-08-09 12:10:21 +0000
committerbors <bors@rust-lang.org>2023-08-09 12:10:21 +0000
commit4bed01c36e01caf8b287cb0f62b4edff8ad52f19 (patch)
tree20d312d42a7cf322fa2fa80403a8ec9e2de21d7a
parentfc2f90e0e5b2738e296aee1a96a40f5b6d7d9ef0 (diff)
parent18b24f60d0423a7b88978ca08bcfca4a905583d1 (diff)
downloadrust-4bed01c36e01caf8b287cb0f62b4edff8ad52f19.tar.gz
rust-4bed01c36e01caf8b287cb0f62b4edff8ad52f19.zip
Auto merge of #15421 - Veykril:workspace-loading, r=Veykril
internal: More error context when failing to invoke the rust toolchain
-rw-r--r--crates/project-model/src/workspace.rs3
1 files changed, 2 insertions, 1 deletions
diff --git a/crates/project-model/src/workspace.rs b/crates/project-model/src/workspace.rs
index f51ea7eeb22..13463e9f72e 100644
--- a/crates/project-model/src/workspace.rs
+++ b/crates/project-model/src/workspace.rs
@@ -167,7 +167,8 @@ impl ProjectWorkspace {
                 cmd.envs(&config.extra_env);
                 cmd.arg("--version").current_dir(current_dir);
                 cmd
-            })?;
+            })
+            .with_context(|| format!("Failed to query rust toolchain version at {current_dir}, is your toolchain setup correctly?"))?;
             anyhow::Ok(
                 cargo_version
                     .get(prefix.len()..)