Skip to content

Rollup of 24 pull requests#159046

Open
jhpratt wants to merge 102 commits into
rust-lang:mainfrom
jhpratt:rollup-mqQhHMX
Open

Rollup of 24 pull requests#159046
jhpratt wants to merge 102 commits into
rust-lang:mainfrom
jhpratt:rollup-mqQhHMX

Conversation

@jhpratt

@jhpratt jhpratt commented Jul 10, 2026

Copy link
Copy Markdown
Member

Successful merges:

r? @ghost

Create a similar rollup

jackh726 and others added 30 commits June 26, 2026 15:04
This change prevents our lints from returning a span with stuff in it
that isn't actually part of the doc comment. When that happens, it
returns `None` instead.
It requires an allocation, and doesn't seem to help in practice.
Fixes a nit found during review.
Co-authored-by: binarycat <binarycat@envs.net>
Co-authored-by: binarycat <binarycat@envs.net>
Co-authored-by: binarycat <binarycat@envs.net>
The function `fn best_blame_constraint()` returns a
`Vec<OutlivesConstraint>` and a `BlameConstraint`. The `BlameConstraint`
is really just a slimmed down version of an `OutlivesConstraint`. So we
can remove `BlameConstraint` entirely and instead return
`Vec<OutlivesConstraint>` and an index into that `Vec`. (Encapsulated in
a struct for nice ergonomics.)

To prepare for that, change the code to adjust `Vec<OutlivesConstraint>`
in-place and return info about the adjusted element, rather than
returning info for a newly created "fake" `OutlivesConstraint`.
A recent change in InstSimplify is able to skip the `and` in this
codegen, which is strictly an improvement. We accept the new version on
newer LLVM and the old verison on older ones using the revisions system.

The change in array-cmp.rs appears to have come from the same revision,
so I gave it the same treatment. It's weirder to me though, because it
merely changes the order of the phi operands which if I understand right
doesn't actually matter.
jhpratt added 5 commits July 9, 2026 20:09
…fix, r=Kobzol

Fix bootstrap submodule path prefix matching

Fixes bootstrap submodule detection to use path-component matching instead of raw string prefix matching.
This prevents paths like src/tools/cargo-vendor from being treated as inside the src/tools/cargo submodule.
Adds a regression test for sibling paths that only share a string prefix with a submodule path.
…=nikic

Reapply "LLVM 23: Run AssignGUIDPass in some places"

This reverts commit 4919940.

This is a re-do of rust-lang#157055 now that the corresponding LLVM change has re-landed.
Use REST API in linkchecker script

This changes the linkchecker script to use the REST API instead of the raw endpoint to better deal with rate limits. We've noticed some occasional times when GitHub Actions hits the rate limit. I believe the raw http interface uses IP-based rate limits. On GitHub Actions, you're at the mercy of when other users exhaust the rate limit for the IP your job happens to grab. I believe this should help, especially using the GITHUB_TOKEN from the Actions workflow.

This will require updating the repos that use this script in order to benefit. This should be backwards compatible, though.

I considered using the `gh` cli as an alternative, which is more convenient to use, but I wanted to make sure that this script can easily be run locally, and it seems more likely that someone will have curl than gh.
…kertdev

[compiler] Implement `PartialOrd` via `Ord` for `Span` and newtype_indexes

For something unconditionally `Ord`, this is better than using `partial_cmp` on fields.

I couldn't find any other cases in the compiler codebase of this, but it's entirely possible I missed some.  Let me know if you can think of any.
…le, r=Kobzol

bootstrap: expand '@argfile' arguments to rustc shim

When cargo invokes `rustc`, if the command line exceeds some system defined limit, `cargo` will try again and pass the arguments in an argfile.

When the bootstrap rustc shim tries to detect `--target`, it does not account for `@argfile` arguments.  As a result, the shim doesn't find `--target` and incorrectly sets `is_build_script` to true, as well as passing the `RUSTC_HOST_FLAGS` to the underlying compiler

This PR makes the shim read all the arguments from every `@argfile`.

Previous work rust-lang#155439 already updated the shim to use `ArgFileCommand` to pass arguments down to the underlying `rustc`.

r? kobzol
@rust-bors rust-bors Bot added the rollup A PR which is a rollup label Jul 10, 2026
@rustbot rustbot added A-attributes Area: Attributes (`#[…]`, `#![…]`) A-CI Area: Our Github Actions CI A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. A-run-make Area: port run-make Makefiles to rmake.rs A-testsuite Area: The testsuite used to check the correctness of rustc PG-exploit-mitigations Project group: Exploit mitigations 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-clippy Relevant to the Clippy team. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc 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. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) labels Jul 10, 2026
@jhpratt

jhpratt commented Jul 10, 2026

Copy link
Copy Markdown
Member Author

@bors r+ rollup=never p=5

@bors try jobs=dist-various-1,test-various,x86_64-gnu-aux,x86_64-gnu-llvm-21-3,x86_64-msvc-1,aarch64-apple,x86_64-mingw-1,i686-msvc-*

@rust-bors

rust-bors Bot commented Jul 10, 2026

Copy link
Copy Markdown
Contributor

📌 Commit 589dd84 has been approved by jhpratt

It is now in the queue for this repository.

@rust-bors rust-bors Bot 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 Jul 10, 2026
@rust-bors

This comment has been minimized.

rust-bors Bot pushed a commit that referenced this pull request Jul 10, 2026
Rollup of 24 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

rust-bors Bot commented Jul 10, 2026

Copy link
Copy Markdown
Contributor

⌛ Testing commit 589dd84 with merge 3ead112...

Workflow: https://github.com/rust-lang/rust/actions/runs/29064023831

rust-bors Bot pushed a commit that referenced this pull request Jul 10, 2026
Rollup of 24 pull requests

Successful merges:

 - #150946 (intrinsics: Add a fallback for non-const libm float functions)
 - #158541 (Move `std::io::Write` to `core::io`)
 - #156027 (Consider captured regions for opaque type region liveness.)
 - #156370 (Reject linked dylib EII default overrides)
 - #156508 (Infer all anonymous lifetimes in assoc consts as `'static`)
 - #157561 (rustdoc: do not include extra stuff in span)
 - #158617 (allow mGCA const arguments to fall back to anon consts)
 - #158645 (Fix splat ICEs and ban it in closures)
 - #158859 (Improve `-Zls` diagnostic message on `.rs` files)
 - #158988 (Redo `TokenStreamIter`)
 - #158347 (Improve generic parameters handling for #[diagnostic::on_const])
 - #158384 (Allow BackwardIncompatibleDropHint in polonius legacy)
 - #158722 (delegation: do not always inherit `ConstArgHasType` predicates)
 - #158739 (view-types: HIR lowering)
 - #158877 (borrowck: Keep returned `path` from `best_blame_constraint()` consistent)
 - #158883 (tests: fix enum-match.rs to handle LLVM 23)
 - #158886 (Add documentation for the `no_std` attribute)
 - #158940 (Implement feature `char_to_u32`)
 - #158951 (Merge three `MaxUniverse`s into one)
 - #158960 (Fix bootstrap submodule path prefix matching)
 - #158961 (Reapply "LLVM 23: Run AssignGUIDPass in some places")
 - #158995 (Use REST API in linkchecker script)
 - #158996 ([compiler] Implement `PartialOrd` via `Ord` for `Span` and newtype_indexes)
 - #159036 (bootstrap: expand '@argfile' arguments to rustc shim)
@rust-bors

rust-bors Bot commented Jul 10, 2026

Copy link
Copy Markdown
Contributor

☀️ Try build successful (CI)
Build commit: 6d30cdc (6d30cdc5bf6516fea832fb29050bbdb3a305821b)
Base parent: af3d955 (af3d95584dbddcae597890340995509a7fb47a50)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-attributes Area: Attributes (`#[…]`, `#![…]`) A-CI Area: Our Github Actions CI A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. A-run-make Area: port run-make Makefiles to rmake.rs 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-clippy Relevant to the Clippy team. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc 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. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver)

Projects

None yet

Development

Successfully merging this pull request may close these issues.