Rollup of 15 pull requests#159925
Closed
JonathanBrouwer wants to merge 65 commits into
Closed
Conversation
…ring.rs to follow the style guide
This updates the rust-version file to da86f4d.
Pull recent changes from https://github.com/rust-lang/rust via Josh. Upstream ref: rust-lang/rust@da86f4d Filtered ref: rust-lang/rustc-dev-guide@af919e8 Upstream diff: rust-lang/rust@390279b...da86f4d This merge was created using https://github.com/rust-lang/josh-sync.
Add warning for breakage hazard for introducing new builtin attrs
rustc_parse: Stop returning `Option` from statement parsing `parse_stmt_without_recovery` had one corner case in which it returned `Ok(None)` - when parsing immediately encountered a closing brace `}`, possibly after parsing outer attributes. It is simpler to never call `parse_stmt_without_recovery` in such contexts than deal with a possibility of no statement being returned without an error. So this PR changes the function's return type from `PResult<'a, Option<Stmt>>` to `PResult<'a, Stmt>` and adjusts one call site to check for a closing brace.
Updated expect messages for `CString` struct and method documentation Completes a task with rust-lang#159751. Updates the expect messages in `library/alloc/src/ffi/c_str.rs`.
bootstrap: Remove obsolete option `build.compiletest-use-stage0-libtest` During the bootstrap stage0 redesign, `compiletest-use-stage0-libtest` was needed as a workaround for big regressions in compiletest build times, due to compiletest's dependency on libtest or `#![feature(internal_output_capture)]`. As of rust-lang#146929, compiletest has no dependency on libtest or any unstable features, and is always built with the stage0 compiler. Since then, `compiletest-use-stage0-libtest` has had no effect, and was retained only to avoid breaking people's builds if they had that option set. Several months later, it should be fine to remove the option entirely. r? jieyouxu (or bootstrap)
Update expect messages in library/alloc/boxed.rs and library/alloc/string.rs to follow the style guide Related issue: rust-lang#159751 Updates the expect messages in library/alloc/boxed.rs and library/alloc/string.rs to follow the style guide.
…uwer Split multiline derives into std/rustc macros Misc cleanup
…nBrouwer Fix `find_attr` hygiene and `rustc_hir` cleanups In particular, `extern crate self as rustc_hir;` leads to very noisy import suggestions if you get an import wrong. Also flatten the `nested_filter` module which seemed to exist just to avoid `None` / `Option:None` nameres conflicts
rustc-dev-guide subtree update Subtree update of `rustc-dev-guide` to rust-lang/rustc-dev-guide@f5333a6. Created using https://github.com/rust-lang/josh-sync. r? @ghost
…target, r=GuillaumeGomez Clarify that the expected runtime symbols signature is for the current target only Some of the signatures expected by our runtime symbols are slightly different from one target to the other one (`i8` vs `u8`), and while the original definition uses type alias, they are not recorded and displayed in the diagnostic. So, to avoid any ambiguity let's add a small note that the displayed signature is only for the current target. r? @GuillaumeGomez
…mejrs Fix error in diagnostic on_unmatched_args fixes rust-lang#159886
rename abort_unwind → abort_on_unwind As suggested in the tracking issue (rust-lang#130338). r? @nia-e Cc @rust-lang/libs-api
rustbot
added
A-attributes
Contributor
Author
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
Jul 25, 2026
Rollup of 15 pull requests try-job: dist-various-1 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 try-job: i686-msvc-*
rust-bors
Bot
added
S-waiting-on-author
Contributor
|
☔ The latest upstream changes made this pull request unmergeable. Please resolve the merge conflicts by rebasing. This pull request was unapproved. |
rustbot
removed
the
S-waiting-on-author
Contributor
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
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:
#[linkage]target checking #159617 (Fix up#[linkage]target checking)#[rustc_paren_sugar]feature gate #159826 (Remove redundant#[rustc_paren_sugar]feature gate)Optionfrom statement parsing #159849 (rustc_parse: Stop returningOptionfrom statement parsing)CStringstruct and method documentation #159853 (Updated expect messages forCStringstruct and method documentation)build.compiletest-use-stage0-libtest#159878 (bootstrap: Remove obsolete optionbuild.compiletest-use-stage0-libtest)find_attrhygiene andrustc_hircleanups #159893 (Fixfind_attrhygiene andrustc_hircleanups)r? @ghost
Create a similar rollup