Skip to content

Rollup of 13 pull requests #133329

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 34 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
44933b5
Print env var in --print=deployment-target
madsmtm Nov 14, 2024
0a619dd
Rename `parse_no_flag` to `parse_no_value`
Zalathar Nov 18, 2024
660246b
Don't allow `-Zunstable-options` to take a value
Zalathar Nov 18, 2024
030ddee
don't require const stability for const impls
fee1-dead Nov 20, 2024
3722481
re-export `is_loongarch_feature_detected`
heiher Nov 20, 2024
2487765
Detect const in pattern with typo
estebank Nov 5, 2024
666bcbd
aarch64 softfloat target: always pass floats in int registers
RalfJung Nov 16, 2024
0465f71
Stop being so bail-y in candidate assembly
compiler-errors Nov 21, 2024
5d30436
Re-delay a resolve `bug`
jieyouxu Nov 21, 2024
514ef18
constify `Add`
fee1-dead Nov 20, 2024
f74fdd2
Add code example for `wrapping_neg` method for signed integers
GuillaumeGomez Nov 21, 2024
9a30362
Update TRPL to latest, including new Chapter 17: Async and Await
chriskrycho Oct 17, 2024
34b4518
Update messages which reference book chs. 17-20
chriskrycho Oct 17, 2024
85c582c
Add support for `--library-path` to `rustbook test`
chriskrycho Oct 18, 2024
e0d7cf0
Update bootstrap tests to support book dependencies
chriskrycho Oct 18, 2024
99832cb
rustbook: fix two small typos
chriskrycho Oct 18, 2024
02f51ec
Change to pass "strip" options in an array of string slices and add o…
xingxue-ibm Nov 19, 2024
21dd59f
Update tests for new TRPL chapter order
chriskrycho Oct 30, 2024
30f9f60
Vendor `trpl` crate so The Book tests work offline
chriskrycho Nov 20, 2024
a4a06b3
Use arc4random of libc for RTEMS target
thesummer Nov 21, 2024
de741d2
distinguish overflow and unimplemented in Step::steps_between
michirakara Sep 26, 2024
6ddc947
Rollup merge of #130867 - michirakara:steps_between, r=dtolnay
jhpratt Nov 22, 2024
0e940f9
Rollup merge of #131859 - chriskrycho:update-trpl, r=onur-ozkan
jhpratt Nov 22, 2024
72cd074
Rollup merge of #132090 - compiler-errors:baily, r=lcnr
jhpratt Nov 22, 2024
f2d0388
Rollup merge of #132658 - estebank:const-in-pattern-typo, r=Nadrieril
jhpratt Nov 22, 2024
b0420b3
Rollup merge of #133041 - madsmtm:print-deployment-target-env-var, r=…
jhpratt Nov 22, 2024
8b6b85c
Rollup merge of #133102 - RalfJung:aarch64-softfloat, r=davidtwco,wes…
jhpratt Nov 22, 2024
b65035f
Rollup merge of #133159 - Zalathar:unstable-options-no-value, r=jieyouxu
jhpratt Nov 22, 2024
0c989b2
Rollup merge of #133217 - xingxue-ibm:fix-strip, r=compiler-errors
jhpratt Nov 22, 2024
17a440e
Rollup merge of #133237 - fee1-dead-contrib:constadd, r=compiler-errors
jhpratt Nov 22, 2024
9cf34d6
Rollup merge of #133238 - heiher:loong-stdarch-rexport, r=Amanieu
jhpratt Nov 22, 2024
7058646
Rollup merge of #133286 - jieyouxu:bug-ourselves, r=compiler-errors
jhpratt Nov 22, 2024
36dd052
Rollup merge of #133301 - GuillaumeGomez:add-example-wrapping-neg, r=…
jhpratt Nov 22, 2024
aac0327
Rollup merge of #133313 - thesummer:fix-arc4random, r=cuviper
jhpratt Nov 22, 2024
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
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
  • Loading branch information
chriskrycho committed Nov 21, 2024
commit 30f9f6049001256971d7bb329aee5d41b617d006
1 change: 1 addition & 0 deletions src/bootstrap/src/core/build_steps/vendor.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ pub fn default_paths_to_vendor(builder: &Builder<'_>) -> Vec<PathBuf> {
"src/tools/rustbook/Cargo.toml",
"src/tools/rustc-perf/Cargo.toml",
"src/tools/opt-dist/Cargo.toml",
"src/doc/book/packages/trpl/Cargo.toml",
] {
paths.push(builder.src.join(p));
}
Expand Down
Loading