diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-12-13 13:18:41 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2020-12-13 13:18:41 +0000 |
commit | 48802e54d1669c68fd27b007533dd6aa5221d089 (patch) | |
tree | 2518eb7bb63741d9ea389c84298adfd1c8b430c7 | |
parent | ca3a54f0a4b59fb2c4429096a1d5c1bc2b8e761e (diff) | |
parent | 7d7949b31527b30a712dd11a8c977644ae2b9e30 (diff) |
Merge #6855
6855: Change recommendation when source can't be loaded from sysroot r=matklad a=flodiebold
Since we just tried running `rustup component add`, it doesn't make sense to me to recommend trying that again. If we're reaching this case, it's probably more likely that rustc was installed via package manager, in which case the source should be installed the same way (e.g. if you install the rust-src package on Ubuntu it will install a symlink in the right place to make our sysroot
detection work, and IMO we should get other distributors to do the same if they aren't already).
Co-authored-by: Florian Diebold <[email protected]>
-rw-r--r-- | crates/project_model/src/sysroot.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crates/project_model/src/sysroot.rs b/crates/project_model/src/sysroot.rs index f0a43eaf6..95b622715 100644 --- a/crates/project_model/src/sysroot.rs +++ b/crates/project_model/src/sysroot.rs | |||
@@ -143,7 +143,7 @@ fn discover_sysroot_src_dir(current_dir: &AbsPath) -> Result<AbsPathBuf> { | |||
143 | can't load standard library from sysroot | 143 | can't load standard library from sysroot |
144 | {} | 144 | {} |
145 | (discovered via `rustc --print sysroot`) | 145 | (discovered via `rustc --print sysroot`) |
146 | try running `rustup component add rust-src` or set `RUST_SRC_PATH`", | 146 | try installing the Rust source the same way you installed rustc", |
147 | sysroot_path.display(), | 147 | sysroot_path.display(), |
148 | ) | 148 | ) |
149 | }) | 149 | }) |