From ba8932d812275eb566d5d45746b642d2e644e218 Mon Sep 17 00:00:00 2001 From: santiago Date: Thu, 15 Oct 2020 19:48:28 -0400 Subject: [PATCH 1/2] Just update docs to reflect new location of rust source. --- README.md | 2 +- src/racer/util.rs | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index e11cd104..9dcdcaf8 100644 --- a/README.md +++ b/README.md @@ -47,7 +47,7 @@ As mentioned in the command output, don't forget to add the installation directo 1. Fetch the Rust sourcecode - 1. automatically via [rustup](https://www.rustup.rs/) and run `rustup component add rust-src` in order to install the source to `$(rustc --print sysroot)/lib/rustlib/src/rust/src`. Rustup will keep the sources in sync with the toolchain if you run `rustup update`. + 1. automatically via [rustup](https://www.rustup.rs/) and run `rustup component add rust-src` in order to install the source to `$(rustc --print sysroot)/lib/rustlib/src/rust/library` (or `$(rustc --print sysroot)/lib/rustlib/src/rust/library` in older toolchains). Rustup will keep the sources in sync with the toolchain if you run `rustup update`. 2. manually from git: https://github.com/rust-lang/rust diff --git a/src/racer/util.rs b/src/racer/util.rs index 2440e520..30d74a8c 100644 --- a/src/racer/util.rs +++ b/src/racer/util.rs @@ -419,7 +419,7 @@ impl fmt::Display for RustSrcPathError { f, "RUST_SRC_PATH environment variable must be set to \ point to the src directory of a rust checkout. \ - E.g. \"/home/foouser/src/rust/src\"" + E.g. \"/home/foouser/src/rust/library\" (or \"/home/foouser/src/rust/src\" in older toolchains)" ), RustSrcPathError::DoesNotExist(ref path) => write!( f, @@ -427,7 +427,7 @@ impl fmt::Display for RustSrcPathError { RUST_SRC_PATH variable \"{:?}\". Try using an \ absolute fully qualified path and make sure it \ points to the src directory of a rust checkout - \ - e.g. \"/home/foouser/src/rust/src\".", + e.g. \"/home/foouser/src/rust/library\" (or \"/home/foouser/src/rust/src\" in older toolchains).", path ), RustSrcPathError::NotRustSourceTree(ref path) => write!( @@ -435,7 +435,7 @@ impl fmt::Display for RustSrcPathError { "Unable to find libstd under RUST_SRC_PATH. N.B. \ RUST_SRC_PATH variable needs to point to the *src* \ directory inside a rust checkout e.g. \ - \"/home/foouser/src/rust/src\". \ + \"/home/foouser/src/rust/library\" (or \"/home/foouser/src/rust/src\" in older toolchains). \ Current value \"{:?}\"", path ), From c8516d5c6d48431f13feeacb2ab41e30ff92f089 Mon Sep 17 00:00:00 2001 From: santiago Date: Thu, 15 Oct 2020 19:52:35 -0400 Subject: [PATCH 2/2] Typo pasting. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9dcdcaf8..51533f19 100644 --- a/README.md +++ b/README.md @@ -47,7 +47,7 @@ As mentioned in the command output, don't forget to add the installation directo 1. Fetch the Rust sourcecode - 1. automatically via [rustup](https://www.rustup.rs/) and run `rustup component add rust-src` in order to install the source to `$(rustc --print sysroot)/lib/rustlib/src/rust/library` (or `$(rustc --print sysroot)/lib/rustlib/src/rust/library` in older toolchains). Rustup will keep the sources in sync with the toolchain if you run `rustup update`. + 1. automatically via [rustup](https://www.rustup.rs/) and run `rustup component add rust-src` in order to install the source to `$(rustc --print sysroot)/lib/rustlib/src/rust/library` (or `$(rustc --print sysroot)/lib/rustlib/src/rust/src` in older toolchains). Rustup will keep the sources in sync with the toolchain if you run `rustup update`. 2. manually from git: https://github.com/rust-lang/rust