Rollup of 10 pull requests #148753
Open
Rollup of 10 pull requests #148753
+2,333
−1,939
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This updates the rust-version file to 401ae55.
Pull recent changes from https://github.com/rust-lang/rust via Josh. Upstream ref: 401ae55 Filtered ref: 1bd47ec470de5c7eab11a24bfee0e7f663cd56a2 Upstream diff: rust-lang/rust@5f9dd05...401ae55 This merge was created using https://github.com/rust-lang/josh-sync.
Automatic Rustup
slightly extend triagebot PR creation message
Remove implementation of LLVM SIMD intrinsics that are not needed anymore
This allows getting rid of all the argument mangling hacks as well as the exported_non_generic_symbols override hack by doing cargo build instead of cargo check. This is also a prerequisite for using native jit mode support in miri that I hope to add to rustc in the future to be used with cg_clif too.
Use the dummy codegen backend
./miri run: verbose by default, add flag to be quiet
This updates the rust-version file to ceb7df7.
Pull recent changes from https://github.com/rust-lang/rust via Josh. Upstream ref: ceb7df7 Filtered ref: cc5fca3f935d6a43e0de7e2ff4c16039b88f5d1c Upstream diff: rust-lang/rust@401ae55...ceb7df7 This merge was created using https://github.com/rust-lang/josh-sync.
Automatic Rustup
Make pthread and other "native" synchronization objects more resilient
In unit tests, writes to stderr that don't use `eprint!` or `eprintln!` will not be captured, and instead interfere with test harness output, making it unreadable.
This prevented the links from being rendered. Sorry for not noticing this before my changes were merged yesterday.
…-dead Remove `#[const_trait]` Remove `#[const_trait]` since we now have `const trait`. Update all structured diagnostics that still suggested the attribute. r? ```@rust-lang/project-const-traits```
…risDenton std: use a non-poisoning `RwLock` for the panic hook The code ignored poison errors using `PoisonError` anyway.
…-should-disable-self-contained-lld, r=Mark-Simulacrum fix: disable self-contained linker when bootstrap-override-lld is set Part of rust-lang#148708. Makes `rust.bootstrap-override-lld` set to `true` or `"external"` disable self-contained linker — actually using linker from one's system.
mgca: Finish implementation of `#[type_const]` tracking issue: rust-lang#132980 fixes rust-lang#140729 fixes rust-lang#140860 - **Fix `#[type_const]` attribute placement validation** - **Perform WF-checking on type_const RHS's** - **Check type_const type is ConstParamTy_ and that RHS matches it** - **Check that impls of `#[type_const]` consts also have the attr** r? ```@BoxyUwU```
…k-Simulacrum Add Crystal Durham to .mailmap 🏳️⚧️ - CAD97/blog#3
…ouxu bootstrap: Render doctest timing reports as text, not JSON These doctest timing reports were added to libtest/rustdoc in rust-lang#144909, but bootstrap's custom test-output renderer wasn't taught about them, so they were being printed as raw JSON instead. Before: ```text { "type": "report", "total_time": 0.738403958, "compilation_time": 0.731513292 } ``` After: ```text all doctests ran in 0.73s; merged doctests compilation took 0.72s ``` <details> <summary><b>Detailed before/after in context</b></summary> ## Before ```text $ x test rustc_mir_transform --doc Building bootstrap Finished `dev` profile [unoptimized] target(s) in 0.03s Testing stage1 {rustc_mir_transform} (aarch64-apple-darwin) Finished `release` profile [optimized + debuginfo] target(s) in 0.12s Doc-tests rustc_mir_transform running 19 tests iiiiiiiiiiii....... test result: ok. 7 passed; 0 failed; 12 ignored; 0 measured; 0 filtered out; finished in 3.28ms running 7 tests iiiiiii test result: ok. 0 passed; 0 failed; 7 ignored; 0 measured; 0 filtered out; finished in 403.67µs { "type": "report", "total_time": 0.738403958, "compilation_time": 0.731513292 } finished in 1.505 seconds Build completed successfully in 0:00:01 ``` ## After ```text $ x test rustc_mir_transform --doc Building bootstrap Finished `dev` profile [unoptimized] target(s) in 0.03s Testing stage1 {rustc_mir_transform} (aarch64-apple-darwin) Finished `release` profile [optimized + debuginfo] target(s) in 0.12s Doc-tests rustc_mir_transform running 19 tests iiiiiiiiiiii....... test result: ok. 7 passed; 0 failed; 12 ignored; 0 measured; 0 filtered out; finished in 3.12ms running 7 tests iiiiiii test result: ok. 0 passed; 0 failed; 7 ignored; 0 measured; 0 filtered out; finished in 395.67µs all doctests ran in 0.73s; merged doctests compilation took 0.72s finished in 1.493 seconds Build completed successfully in 0:00:01 ``` </details>
tidy: Don't bypass stderr output capture in unit tests
In unit tests, writes to stderr that don't use `eprint!` or `eprintln!` will not be captured, and instead interfere with test harness output, making it unreadable.
<details>
<summary><b>Detailed before/after</b></summary>
## Before
```text
$ x test tidyselftest --no-doc
Building bootstrap
Finished `dev` profile [unoptimized] target(s) in 0.03s
Testing stage1 tidy (aarch64-apple-darwin)
Compiling tidy v0.1.0 (/Users/stuart/Dev/rust/rust/src/tools/tidy)
Finished `release` profile [optimized + debuginfo] target(s) in 0.23s
Running unittests src/lib.rs (build/aarch64-apple-darwin/bootstrap-tools/aarch64-apple-darwin/release/deps/tidy-c33a0cc08cf46c66)
running 20 tests
tidy [alphabetical-test]: bad:3 found `tidy-alphabetical-start` expecting `tidy-alphabetical-end`
tidy [alphabetical-test]: FAIL
tidy [alphabetical-test]: bad: reached end of file expecting `tidy-alphabetical-end`tidy [alphabetical-test]: bad:4: line not in alphabetical order
tidy [alphabetical-test]: bad:5 found `tidy-alphabetical-end` expecting `tidy-alphabetical-start`
tidy [alphabetical-test]: FAIL
tidy [alphabetical-test]: FAIL
tidy [alphabetical-test].: tidy [alphabetical-test...bad:4: line not in alphabetical order..]: tidy [alphabetical-test]: ..
bad:7: line not in alphabetical order
tidy [tidy [bad:2 found `tidy-alphabetical-end` expecting `tidy-alphabetical-start`
alphabetical-testtidy [tidy [alphabetical-test]: bad:4: line not in alphabetical order
.tidy [alphabetical-test]..]alphabetical-testtidy []: bad:4: line not in alphabetical orderalphabetical-testalphabetical-test]: tidy [FAILalphabetical-test
]: FAIL
]: FAIL
: FAIL
: bad:4: line not in alphabetical order
tidy [alphabetical-test]: FAIL
tidy [.alphabetical-test]: FAIL
.tidy [alphabetical-test]: FAIL
..tidy [alphabetical-test]: bad:3: line not in alphabetical order
tidy [alphabetical-test]: FAIL
tidy [alphabetical-test]: bad:3: line not in alphabetical order
tidy [alphabetical-test]: FAIL
.....
test result: ok. 20 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 1.01ms
Running unittests src/main.rs (build/aarch64-apple-darwin/bootstrap-tools/aarch64-apple-darwin/release/deps/rust_tidy-25232a69af4dd751)
running 0 tests
test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 26.88µs
finished in 0.255 seconds
Build completed successfully in 0:00:00
```
## After
```text
$ x test tidyselftest --no-doc
Building bootstrap
Finished `dev` profile [unoptimized] target(s) in 0.03s
Testing stage1 tidy (aarch64-apple-darwin)
Compiling tidy v0.1.0 (/Users/stuart/Dev/rust/rust/src/tools/tidy)
Finished `release` profile [optimized + debuginfo] target(s) in 1.74s
Running unittests src/lib.rs (build/aarch64-apple-darwin/bootstrap-tools/aarch64-apple-darwin/release/deps/tidy-c33a0cc08cf46c66)
running 20 tests
....................
test result: ok. 20 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 1.35ms
Running unittests src/main.rs (build/aarch64-apple-darwin/bootstrap-tools/aarch64-apple-darwin/release/deps/rust_tidy-25232a69af4dd751)
running 0 tests
test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 27.17µs
finished in 1.764 seconds
Build completed successfully in 0:00:02
```
</details>
miri subtree update Subtree update of `miri` to rust-lang/miri@7d5ae36. Created using https://github.com/rust-lang/josh-sync. r? ``@ghost``
Fix typo in unstable-book link This prevented the links from being rendered. Sorry for not noticing this before my changes were merged yesterday. Introduced in rust-lang#147935 cc ``@petrochenkov``
… r=jieyouxu Add myself(chenyukang) to the review rotation hope I have more time to catch up 💙
rustbot
added
A-attributes
Member
Author
|
@bors r+ rollup=never p=5 |
Collaborator
bors
added
S-waiting-on-bors
Collaborator
bors
added a commit
that referenced
this pull request
Nov 9, 2025
Rollup of 10 pull requests Successful merges: - #148683 (Remove `#[const_trait]`) - #148687 (std: use a non-poisoning `RwLock` for the panic hook) - #148709 (fix: disable self-contained linker when bootstrap-override-lld is set) - #148716 (mgca: Finish implementation of `#[type_const]`) - #148722 (Add Crystal Durham to .mailmap) - #148723 (bootstrap: Render doctest timing reports as text, not JSON) - #148724 (tidy: Don't bypass stderr output capture in unit tests) - #148734 (miri subtree update) - #148736 (Fix typo in unstable-book link) - #148744 (Add myself(chenyukang) to the review rotation) r? `@ghost` `@rustbot` modify labels: rollup
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
15 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Successful merges:
#[const_trait]#148683 (Remove#[const_trait])RwLockfor the panic hook #148687 (std: use a non-poisoningRwLockfor the panic hook)#[type_const]#148716 (mgca: Finish implementation of#[type_const])r? @ghost
@rustbot modify labels: rollup
Create a similar rollup