Skip to content

Rollup of 4 pull requests - #152257

Closed
JonathanBrouwer wants to merge 8 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-WihyJi6
Closed

Rollup of 4 pull requests#152257
JonathanBrouwer wants to merge 8 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-WihyJi6

Conversation

@JonathanBrouwer

Copy link
Copy Markdown
Member

Successful merges:

r? @ghost

Create a similar rollup

arferreiraand others added 8 commits February 6, 2026 12:41
Signed-off-by: arferreira <arfs.antonio@gmail.com>
…ir_build, r=JonathanBrouwer
Convert to inline diagnostics in `rustc_mir_build`
Part of rust-lang#151366.
r? @JonathanBrouwer
…onst_eval, r=JonathanBrouwer
Convert to inline diagnostics in `rustc_const_eval`
Part of rust-lang#151366.
r? @JonathanBrouwer
…=oli-obk
Dont strip const blocks in array lengths
r? oli-obk
mGCA now handles const blocks by *always* handling them during `lower_expr_to_const_arg_direct` instead of *sometimes* stripping them out at parse time. This is just generally a lot clearer/nicer but also means parsing isn't lossy which is just straight up wrong.
We now use `MgcaDisambiguation::Direct` for const blocks because we "directly" represent a const block as `hir::ConstArgKind::Anon` :> The only time that an anon const for const generics uses `MgcaDisambiguation::AnonConst` is for unbraced literals.
Once we properly support literals in `hir::ConstArgKind` (see rust-lang#152139rust-lang#152001) then `MgcaDisambiguation` can be renamed to `AnonConstKind` with `TypeSystem` and `NonTypeSystem` variants. We can also get rid of `mgca_direct_lit_hack`. I expect this to be a very nice cleanup :)
Fixesrust-lang/rustfmt#6788
The diff relating to passing spans around is to avoid a bunch of mGCA diagnostics changing from `const {}` to `{}`. I'm not entirely sure why this was happening.
cc @rust-lang/rustfmt
How do I run the tests in the rustfmt repo from here? `x test rustfmt` only seems to run like 100 tests and doesn't result in a `target/issue-6788.rs` getting created. I've verified locally that this formats correctly though
…=GuillaumeGomez
Use relative paths for std links in rustc-docs
Fixesrust-lang#151496
This adds `--extern-html-root-url` for each `STD_PUBLIC_CRATES` entry pointing to `../`, so that `rustc-docs` links to the locally installed `rust-docs` via relative paths.
r? @GuillaumeGomez@rami3l
@rust-borsrust-borsBot added the rollup A PR which is a rollup label Feb 6, 2026
@rustbotrustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. 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. T-rustfmt Relevant to the rustfmt team, which will review and decide on the PR/issue. labels Feb 6, 2026
@JonathanBrouwer

Copy link
Copy Markdown
MemberAuthor

@bors r+ rollup=never p=5

@rust-bors

rust-borsBot commented Feb 6, 2026

Copy link
Copy Markdown
Contributor

📌 Commit c91c841 has been approved by JonathanBrouwer

It is now in the queue for this repository.

@rust-borsrust-borsBot added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Feb 6, 2026
@JonathanBrouwer
JonathanBrouwer deleted the rollup-WihyJi6 branch August 21, 2026 08:19
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

rollupA PR which is a rollupS-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-bootstrapRelevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.T-rustfmtRelevant to the rustfmt team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@JonathanBrouwer@rustbot@arferreira@BoxyUwU@GuillaumeGomez