diff options
| author | Chris Krycho <hello@chriskrycho.com> | 2024-11-20 07:59:09 -0700 |
|---|---|---|
| committer | Chris Krycho <hello@chriskrycho.com> | 2024-11-23 09:01:08 -0700 |
| commit | 7630b4975cb6b89fafd6bae6eaab9af33c30fc7a (patch) | |
| tree | 95c2ec87e3526ef6cc49b6f6c10f1ce8c0ca2bde /src/bootstrap | |
| parent | d4275e08e7f73efabb2c41ceb27020c6f9005a68 (diff) | |
| download | rust-7630b4975cb6b89fafd6bae6eaab9af33c30fc7a.tar.gz rust-7630b4975cb6b89fafd6bae6eaab9af33c30fc7a.zip | |
Vendor `trpl` crate so The Book tests work offline
Without this change:
$ ./x test --set build.vendor=true src/doc/book
# (lots of output)
error: failed to select a version for the requirement `futures = "^0.3"` (locked to 0.3.30)
candidate versions found which didn't match: 0.3.31, 0.3.27
location searched: directory source `/Users/chris/dev/rust-lang/rust/vendor` (which is replacing registry `crates-io`)
required by package `trpl v0.2.0 (/Users/chris/dev/rust-lang/rust/src/doc/book/packages/trpl)`
perhaps a crate was updated and forgotten to be re-vendored?
Build completed unsuccessfully in 0:01:19
With this change:
$ ./x test --set build.vendor=true src/doc/book
# (lots of build output)
Testing stage1 mdbook src/doc/book (aarch64-apple-darwin)
finished in 86.949 seconds
Build completed successfully in 0:04:05
# Conflicts:
# src/bootstrap/src/core/build_steps/vendor.rs
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/src/core/build_steps/vendor.rs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/bootstrap/src/core/build_steps/vendor.rs b/src/bootstrap/src/core/build_steps/vendor.rs index ce044c4a4a7..26d0f100ffd 100644 --- a/src/bootstrap/src/core/build_steps/vendor.rs +++ b/src/bootstrap/src/core/build_steps/vendor.rs @@ -20,6 +20,7 @@ pub fn default_paths_to_vendor(builder: &Builder<'_>) -> Vec<(PathBuf, Vec<&'sta ("src/tools/rustbook/Cargo.toml", SUBMODULES_FOR_RUSTBOOK.into()), ("src/tools/rustc-perf/Cargo.toml", vec!["src/tools/rustc-perf"]), ("src/tools/opt-dist/Cargo.toml", vec![]), + ("src/doc/book/packages/trpl/Cargo.toml", vec![]), ] .into_iter() .map(|(path, submodules)| (builder.src.join(path), submodules)) |