diff options
| author | bors <bors@rust-lang.org> | 2024-03-26 02:07:49 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-03-26 02:07:49 +0000 |
| commit | 8b9e47c136aeee998effdcae356e134b8de65891 (patch) | |
| tree | 56684502a9f401734b1b02da80ca4b4930207f1d /src | |
| parent | c98ea0d8085473c2947eb7fd0d1a1be9f1626251 (diff) | |
| parent | 56e8f67c87690feb93a8ddec3625f420d1695873 (diff) | |
Auto merge of #123065 - workingjubilee:rollup-bve45ex, r=workingjubilee
Rollup of 10 pull requests Successful merges: - #122707 (Fix a typo in the alloc::string::String docs) - #122769 (extend comments for reachability set computation) - #122892 (fix(bootstrap/dist): use versioned dirs when vendoring) - #122896 (Update stdarch submodule) - #122923 (In `pretty_print_type()`, print `async fn` futures' paths instead of spans.) - #122950 (Add regression tests for #101903) - #123039 (Update books) - #123042 (Import the 2021 prelude in the core crate) - #123044 (`Instance` is `Copy`) - #123051 (did I mention that tests are super cool? ) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src')
| -rw-r--r-- | src/bootstrap/src/core/build_steps/dist.rs | 1 | ||||
| m--------- | src/doc/edition-guide | 0 | ||||
| m--------- | src/doc/reference | 0 | ||||
| m--------- | src/doc/rust-by-example | 0 | ||||
| m--------- | src/doc/rustc-dev-guide | 0 |
5 files changed, 1 insertions, 0 deletions
diff --git a/src/bootstrap/src/core/build_steps/dist.rs b/src/bootstrap/src/core/build_steps/dist.rs index 012d64e5344..d9c7032d0db 100644 --- a/src/bootstrap/src/core/build_steps/dist.rs +++ b/src/bootstrap/src/core/build_steps/dist.rs @@ -1003,6 +1003,7 @@ impl Step for PlainSourceTarball { // Vendor all Cargo dependencies let mut cmd = Command::new(&builder.initial_cargo); cmd.arg("vendor") + .arg("--versioned-dirs") .arg("--sync") .arg(builder.src.join("./src/tools/cargo/Cargo.toml")) .arg("--sync") diff --git a/src/doc/edition-guide b/src/doc/edition-guide -Subproject e1eead1181a691e56299294d5f1d62fe7a26d31 +Subproject 98b33e9a441457b0a491fe1be90e7de64eafc3e diff --git a/src/doc/reference b/src/doc/reference -Subproject 5afb503a4c1ea3c84370f8f4c08a1cddd1cdf6a +Subproject 984b36eca4b9293df04d5ba4eb5c4f77db0f51d diff --git a/src/doc/rust-by-example b/src/doc/rust-by-example -Subproject e093099709456e6fd74fecd2505fdf49a2471c1 +Subproject 7601e0c5ad29d5bd3b518700ea63fddfff5915a diff --git a/src/doc/rustc-dev-guide b/src/doc/rustc-dev-guide -Subproject 8a5d647f19b08998612146b1cb2ca47083db63e +Subproject ffa246b7fd95a96e1cd54883e613aed42c32547 |
