Rollup of 5 pull requests#155786
Closed
JonathanBrouwer wants to merge 18 commits intorust-lang:mainfrom
Closed
Conversation
…hanges The test `tests/debuginfo/basic-stepping.rs` has a history of regressing for subtle reasons, and has non-obvious expectations. So I'd like to keep an extra eye on it.
…ttr-span, r=JonathanBrouwer Fix ICE from cfg_attr_trace Fixes rust-lang#154801 Fixes rust-lang#143094 r? @JonathanBrouwer The root cause is we recovery from parsing attribute error here: https://github.com/rust-lang/rust/blob/ed6f9af7d47f5a5eda2a4a1925d1e250b51a37f2/compiler/rustc_attr_parsing/src/parser.rs#L550 while the later suggestion code from type checking try to inspect the attr span of the `expr` in the second error, keep the span seems reasonable.
…laumeGomez Add an edge-case test for `--remap-path-prefix` for `rustc` & `rustdoc` Intended to resolve @lolbinarycat concern rust-lang#155307 (comment)
cleanup, restructure and merge `tests/ui/deriving` into `tests/ui/derives` As a followup to rust-lang#155615, this PR deletes some outdated tests from these directories, splits up `ui/derives` into smaller directories to roughly group tests by the derive macros they use and moves over all tests from `ui/deriving` into `ui/derives`. r? @Kivooeo
…thanBrouwer Add a higher-level API for parsing attributes
triagebot.toml: Ping Enselic when tests/debuginfo/basic-stepping.rs changes The test `tests/debuginfo/basic-stepping.rs` has a history of [regressing for subtle reasons](rust-lang#33013 (comment)) ([retroactively](rust-lang#144497)), and has [expected behavior](rust-lang#153941) that is [not obvious](rust-lang#155377). So I'd like to keep an extra eye one it.
rustbot
added
A-attributes
Contributor
Author
|
@bors r+ rollup=never p=5 |
Contributor
rust-bors
Bot
added
S-waiting-on-bors
This comment has been minimized.
This comment has been minimized.
rust-bors Bot
pushed a commit
that referenced
this pull request
Apr 25, 2026
…uwer Rollup of 5 pull requests Successful merges: - #154803 (Fix ICE from cfg_attr_trace ) - #155485 (Add an edge-case test for `--remap-path-prefix` for `rustc` & `rustdoc`) - #155659 (cleanup, restructure and merge `tests/ui/deriving` into `tests/ui/derives`) - #155696 (Add a higher-level API for parsing attributes) - #155769 (triagebot.toml: Ping Enselic when tests/debuginfo/basic-stepping.rs changes)
Collaborator
|
The job Click to see the possible cause of the failure (guessed by this bot) |
rust-bors
Bot
added
S-waiting-on-review
Contributor
|
💔 Test for e229b97 failed: CI. Failed job:
|
Contributor
Author
|
Spurious |
rust-bors
Bot
added
the
S-waiting-on-author
Contributor
|
This pull request was unapproved due to being closed. |
rustbot
removed
the
S-waiting-on-review
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
8 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:
--remap-path-prefixforrustc&rustdoc#155485 (Add an edge-case test for--remap-path-prefixforrustc&rustdoc)tests/ui/derivingintotests/ui/derives#155659 (cleanup, restructure and mergetests/ui/derivingintotests/ui/derives)r? @ghost
Create a similar rollup