-
Notifications
You must be signed in to change notification settings - Fork 13.9k
Rollup of 4 pull requests #148100
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
Open
matthiaskrgr
wants to merge
12
commits into
rust-lang:master
Choose a base branch
from
matthiaskrgr:rollup-vrd4wy8
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Rollup of 4 pull requests #148100
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
Signed-off-by: Jonathan Brouwer <jonathantbrouwer@gmail.com>
Signed-off-by: Jonathan Brouwer <jonathantbrouwer@gmail.com>
This function doesn't need its own clone of the `Arc`, and can just take a reference instead.
The old name was a holdover from libtest, but in compiletest we only use it for `//@ should-fail` tests, which are tests of compiletest itself.
Stop passing resolver disambiguator state to AST lowering. AST->HIR lowering can use a disjoint set of `DefPathData` as the resolver, so we don't need to pass the disambiguator state. r? `@oli-obk`
…lmann Improvements to attribute suggestions Changes in commit 1: - Add `AcceptContext::suggestions`, which retrieves the suggestions for the currently parsing attribute - This happens to fix a bug in the way `#[macro_export`]. Closes rust-lang#147987 Changes in commit 2: - Add a check to the suggestions function so the suggestions for attributes in cfg_attr are nicer. Fixes rust-lang#147693 This is also part (but not all) of the changes needed to unblock rust-lang#147945 r? `@jdonszelmann`
…szelmann chore: Update to the latest annotate-snippets This PR updates `annotate-snippets` to the latest version and updates the adapter code[^1] so that `AnnotateSnippetEmitter`'s output matches `HumanEmitter`'s output. If anyone would like to see the differences[^2] between `AnnotateSnippetEmitter` and `HumanEmitter`, [I have a branch](https://github.com/Muscraft/rust/tree/annotate-snippets-default-renderer) where `AnnotateSnippetEmitter` is used in place of `HumanEmitter`. [^1]: A lot of the adapter code changes are based on code for `HumanEmitter`. [^2]: Some of the test differences will go away when rust-lang#148001 and rust-lang#148004 are merged.
compiletest: Simplify passing arguments to spawned test threads The current code structure was heavily influenced by wanting to match the libtest executor as closely as possible. Now that the libtest executor has been removed, we can get rid of some complexity that no longer serves a purpose in the new executor. --- The renaming of `ShouldPanic` is only semi-related, but I included it here because it's small, and as a separate PR it would have conflicted with this one. r? jieyouxu
|
@bors r+ rollup=never p=5 |
bors
added a commit
that referenced
this pull request
Oct 25, 2025
Rollup of 4 pull requests Successful merges: - #143361 (Stop passing resolver disambiguator state to AST lowering.) - #148000 (Improvements to attribute suggestions) - #148007 (chore: Update to the latest annotate-snippets) - #148088 (compiletest: Simplify passing arguments to spawned test threads) r? `@ghost` `@rustbot` modify labels: rollup
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
A-attributes
Area: Attributes (`#[…]`, `#![…]`)
A-compiletest
Area: The compiletest test runner
A-testsuite
Area: The testsuite used to check the correctness of rustc
PG-exploit-mitigations
Project group: Exploit mitigations
rollup
A PR which is a rollup
S-waiting-on-bors
Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
T-bootstrap
Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)
T-compiler
Relevant to the compiler team, which will review and decide on the PR/issue.
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:
r? @ghost
@rustbot modify labels: rollup
Create a similar rollup