Rollup of 13 pull requests#152055
Closed
JonathanBrouwer wants to merge 30 commits intorust-lang:mainfrom
Closed
Conversation
`DEVELOPER_DIR` is the standard environment variable for overriding the Xcode version, there is no need to invoke `xcode-select --switch` manually to do this. The variable is documented in both `man xcode-select` and `man xcrun`.
This has the nice side-effect of eliminating `rustc_codegen_ssa`'s dependency on `rustc_query_system`. (Indeed, looking through such dependencies was how I found this.)
It probably wasn't committed after an earlier change.
Show largest job duration changes in hours and minutes in the post-merge report This was suggested by... someone, somewhere. But it's a good idea. See rust-lang#152025 (comment) - now instead of seconds it would show this: # Job duration changes 1. [dist-apple-various](https://github.com/rust-lang/rust/actions/runs/21617345733#summary-62299011925): 1h 3m -> 1h 29m (+41.5%) 2. [dist-x86_64-apple](https://github.com/rust-lang/rust/actions/runs/21617345733#summary-62299011972): 2h 1m -> 2h 21m (+16.4%) 3. [dist-ohos-x86_64](https://github.com/rust-lang/rust/actions/runs/21617345733#summary-62299011829): 1h 11m -> 1h 19m (+12.4%) 4. [x86_64-gnu-llvm-20](https://github.com/rust-lang/rust/actions/runs/21617345733#summary-62299011909): 1h 9m -> 1h 17m (+11.9%) 5. [pr-check-1](https://github.com/rust-lang/rust/actions/runs/21617345733#summary-62299011862): 32m 27s -> 28m 44s (-11.4%) 6. [tidy](https://github.com/rust-lang/rust/actions/runs/21617345733#summary-62299011845): 2m 37s -> 2m 52s (+9.9%) 7. [armhf-gnu](https://github.com/rust-lang/rust/actions/runs/21617345733#summary-62299011763): 1h 22m -> 1h 30m (+9.5%) 8. [dist-aarch64-apple](https://github.com/rust-lang/rust/actions/runs/21617345733#summary-62299011941): 1h 54m -> 1h 44m (-9.1%) 9. [x86_64-gnu-llvm-21-3](https://github.com/rust-lang/rust/actions/runs/21617345733#summary-62299011924): 1h 45m -> 1h 54m (+9.1%) 10. [x86_64-gnu-llvm-21-1](https://github.com/rust-lang/rust/actions/runs/21617345733#summary-62299011923): 1h 9m -> 1h 15m (+9.0%)
…ukang coverage: Add a test case for a previously-unknown span mismatch - This is a revised version of rust-lang#152036. --- In rust-lang#145643, a defensive check was added to detect spans that unexpectedly don't match the context of the function body span. There was no known way to trigger that condition, so a `debug_assert!` was added to make violations easier to notice. A way to trigger the condition using nested macro expansions was subsequently found and reported as an ICE (in debug-assertion builds) in rust-lang#147339. Now that we have a concrete example to investigate, we can remove the `debug_assert!` so that there is no ICE in debug-assertion builds. - Fixes rust-lang#147339. r? chenyukang
…t, r=lqd Convert to inline diagnostics in `rustc_infer` For rust-lang#151366
…BoxyUwU Forbid manual `Unpin` impls for structurally pinned types Part of [`pin_ergonomics`](rust-lang#130494). It forbids to `impl Unpin for T` where `T` is an ADT marked with `#[pin_v2]`.
…yUwU Check proj's parent is trait or not when checking dyn compatibility Fixes rust-lang#151708 When checking dyn compatibility, `proj` here may point to free const whose parent is not trait. Then `TraitRef::from_assoc` will call `generics_of` on the wrong parent. After this change, the following case without `#[type_const]` will still emit ICE same to rust-lang#149066, but different to the ICE reported in rust-lang#151708 ```rust #![feature(min_generic_const_args)] // #[type_const] const N: usize = 2; trait CollectArray { fn inner_array(&self) -> [i32; N]; } ``` r? @BoxyUwU
…anBrouwer Port `rustc_mir` to attribute parser Tracking issue: rust-lang#131229
…r=BoxyUwU error on unsized AnonConsts The constant evaluator does not support unsized types, however, unsized AnonConsts were never checked to be Sized, so no errors were generated on them and the constant was attempted to be constant evaluated. This caused the constant evaluator to ICE. Add a special case for AnonConsts in rustc_hir_typeck, as suggested by @BoxyUwU in rust-lang#137582. There is no checking for `#![feature(unsized_const_params)]` which should eventually revert this check when the feature becomes more implemented. That issue is assigned to @el-ev but I started looking into this as a jumping off point / motivation to learn some compiler stuff, and I eventually got to the point of fixing it, so I'm submitting a PR anyway. So just a ping/FYI to @el-ev that I'm submitting this, sorry! There are three relevant github issues to this ICE that I could find: - fixes rust-lang#137582 - fixes rust-lang#151591 The similar issue rust-lang#104685 is NOT fixed, it might be good to glance at that before verifying this particular fix, to make sure this fix is actually in the right place. (I haven't looked at it much) r? @BoxyUwU
Convert to inline diagnostics in `rustc_attr_parsing` Converts a crate for rust-lang#151366 This PR is almost completely autogenerated by a hacky script I have locally :)
Use `DEVELOPER_DIR` instead of a custom `xcode-select` script `DEVELOPER_DIR` is the standard environment variable for overriding the Xcode version, there is no need to invoke `xcode-select --switch` manually to do this. The variable is documented in both `man xcode-select` and `man xcrun`. Using this makes reproducing things locally a little easier (you can just copy the env var). r? shepmaster
…-derives, r=Zalathar `NativeLib` cleanups Improvements to `NativeLib`. r? @Zalathar
…-Simulacrum disable socket tests in Miri rust-lang#150428 added some tests that do not work in Miri since we do not support sockets. r? @Mark-Simulacrum
…rt, r=jdonszelmann Convert to inline diagnostics in `rustc_query_system` For rust-lang#151366 (comment) r? @jdonszelmann (or anyone else who feels like it)
…s, r=GuillaumeGomez Try to fix `rustdoc-gui/globals.goml` flakyness Part of rust-lang#93784. Hopefully this one fixes it... r? ghost
rustbot
added
A-attributes
Contributor
Author
|
@bors r+ rollup=never p=5 |
Contributor
rust-bors
bot
added
S-waiting-on-bors
Contributor
Author
|
Wow that rollup somehow had only one conflict, nice |
This comment has been minimized.
This comment has been minimized.
rust-bors bot
pushed a commit
that referenced
this pull request
Feb 3, 2026
…uwer Rollup of 13 pull requests Successful merges: - #152034 (Show largest job duration changes in hours and minutes in the post-merge report) - #152039 (coverage: Add a test case for a previously-unknown span mismatch) - #152045 (Convert to inline diagnostics in `rustc_infer`) - #149263 (Forbid manual `Unpin` impls for structurally pinned types) - #151754 (Check proj's parent is trait or not when checking dyn compatibility) - #151848 (Port `rustc_mir` to attribute parser) - #151874 (error on unsized AnonConsts) - #151944 (Convert to inline diagnostics in `rustc_attr_parsing`) - #152012 (Use `DEVELOPER_DIR` instead of a custom `xcode-select` script) - #152019 (`NativeLib` cleanups) - #152029 (disable socket tests in Miri) - #152041 (Convert to inline diagnostics in `rustc_query_system`) - #152050 (Try to fix `rustdoc-gui/globals.goml` flakyness) Failed merges: - #152046 (Use glob imports for attribute parsers)
rust-bors
bot
added
S-waiting-on-review
Contributor
|
💔 Test for 2ee04fa failed: CI. Failed job:
|
Collaborator
|
A job failed! Check out the build log: (web) (plain enhanced) (plain) Click to see the possible cause of the failure (guessed by this bot) |
rust-bors
bot
added
S-waiting-on-author
Contributor
|
PR #152012, which is a member of this rollup, was unapproved. |
rustbot
removed
the
S-waiting-on-author
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
13 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:
rustc_infer#152045 (Convert to inline diagnostics inrustc_infer)Unpinimpls for structurally pinned types #149263 (Forbid manualUnpinimpls for structurally pinned types)rustc_mirto attribute parser #151848 (Portrustc_mirto attribute parser)rustc_attr_parsing#151944 (Convert to inline diagnostics inrustc_attr_parsing)DEVELOPER_DIRinstead of a customxcode-selectscript #152012 (UseDEVELOPER_DIRinstead of a customxcode-selectscript)NativeLibcleanups #152019 (NativeLibcleanups)rustc_query_system#152041 (Convert to inline diagnostics inrustc_query_system)rustdoc-gui/globals.gomlflakyness #152050 (Try to fixrustdoc-gui/globals.gomlflakyness)Failed merges:
r? @ghost
Create a similar rollup