Rollup of 5 pull requests#153137
Closed
JonathanBrouwer wants to merge 11 commits intorust-lang:mainfrom
Closed
Conversation
This reverts commit ce4c17f.
Revert "Also duplicate `#[expect]` attribute in `#[derive]`-ed code" Turns out rust-lang#152289 doesn't work, not because cloning an attribute doesn't keep the same attribute id, but because `#[cfg]` and `#[cfg_attr]` [re-parse items from scratch](https://github.com/rust-lang/rust/blob/859951e3c7c9d0322c39bad49221937455bdffcd/compiler/rustc_builtin_macros/src/cfg_eval.rs#L100-L109) bypassing any cloning on AST and forcing the creation of new attribute IDs. 😕 Fixes rust-lang#153036 Fixes rust-lang#152401 Reopens rust-lang#150553
Stop using `LinkedGraph` in `lexical_region_resolve` There are only two users of the older `LinkedGraph` data structure, and this is one. It turns out that this diagnostic-related code doesn't need any non-trivial graph operations (since it does its own graph traversal); it just needs the ability to get a list of in-edges or out-edges (constraints) for any particular node. That's easy enough to do with a simple custom data structure. Inspired by rust-lang#152621, which wants to make changes to `LinkedGraph` that wouldn't make sense for this use-site.
Revert "Simplify internals of `{Rc,Arc}::default`"
This reverts rust-lang#152591 following a [perf run being done](rust-lang#152591 (comment)). I'm not really positioned at this time to dive in further and understand the performance regressions, so I'll back away from `Rc`/`Arc` and leave them as-is.
…, r=GuillaumeGomez Remove mutation from macro path URL construction Resolves the `FIXME` in `generate_macro_def_id_path`. The old code mutated `path` to build the URL — popping the macro name, pushing an interned filename, then restoring the original at the end. None of that was necessary. A slice pattern gives us `module_path` and `last` without touching the original, and `push_fmt(format_args!(...))` writes the filename directly into the URL builder, same as `make_href` already does. Also tightened the error guards: the original `path.len() < 2` is now two distinct checks with messages that describe the actual failure (empty path vs. single-element path missing the crate prefix). r? @GuillaumeGomez
…oboet Recover feature lang_items for emscripten Fixes rust-lang#152469 (comment)
Contributor
Author
|
@bors r+ rollup=never p=6 |
Contributor
Contributor
Author
|
Trying commonly failed jobs |
Contributor
|
⌛ Trying commit 5303a74 with merge 7b30963… To cancel the try build, run the command Workflow: https://github.com/rust-lang/rust/actions/runs/22448608102 |
rust-bors bot
pushed a commit
that referenced
this pull request
Feb 26, 2026
Rollup of 5 pull requests try-job: test-various try-job: x86_64-gnu-aux try-job: x86_64-gnu-llvm-21-3 try-job: x86_64-msvc-1 try-job: aarch64-apple try-job: x86_64-mingw-1
Contributor
Author
Contributor
|
Try build cancelled. Cancelled workflows: |
Contributor
|
📋 Only unclosed PRs can be unapproved. |
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
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:
#[expect]attribute in#[derive]-ed code" #153055 ( Revert "Also duplicate#[expect]attribute in#[derive]-ed code")LinkedGraphinlexical_region_resolve#153012 (Stop usingLinkedGraphinlexical_region_resolve){Rc,Arc}::default" #153108 (Revert "Simplify internals of{Rc,Arc}::default")r? @ghost
Create a similar rollup