Skip to content

Rollup of 6 pull requests - #162589

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

Rollup of 6 pull requests#162589
JonathanBrouwer wants to merge 19 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-8IiiIPF

Conversation

@JonathanBrouwer

Copy link
Copy Markdown
Member

Successful merges:

r? @ghost

Create a similar rollup

sjwang05 and others added 19 commits September 1, 2026 17:11
This makes their test environment consistent between runs inside the
cg_clif and rust repos.
A fatal error that doesn't actually abort is indistinguishable from a
regular error. And the only places where emit_almost_fatal is called,
the produced FatalError is ignored.
The explanation provided was wrong. Libc doesn't exist on Windows, so
naturally this failed on missing lib. I have no idea what shenanigans
link.exe does to make this pass, but surely it doesn't actually link
libc.
This avoids a delayed bug if compilation is aborted between checking
function ABIs and codegening all functions.
And remove the encoded metadata if there are any errors or delayed bugs
after encoding.
* fix(traits): Remove expression references from index suggestions
* Use expression spans for index reference removal suggestions
* refactor(trait-selection): Simplify dereference suggestion guard
…bjorn3

Subtree sync for rustc_codegen_cranelift

Preparation for moving from git-subtree for josh-sync.

r? @ghost

@rustbot label +A-codegen +A-cranelift +T-compiler +subtree-sync
re-equate the object bound's trait ref with the goal's when considering object bounds

rust-lang/trait-system-refactor-initiative#295 bisects to rust-lang#152859, which changed `probe_and_consider_object_bound_candidate` to pass the trait object's trait ref in a binder to `predicates_for_object_candidate`, which calls `instantiate_binder_with_infer` on the binder.

Re-instantiating the binder like this, however, loses the constraint that `'x: 'static`, even though earlier in `match_assumption` we actually did equate the object trait ref with the goal's trait ref, which gave us the `eq('x, 'static)` relationship we needed. However, the new inference var has no relationship with the equality we established; hence we lose `'x: 'static` and therefore `Self: 'static` and `'s: 'static`.

We therefore inline `match_assumption` and directly equate the assumption's trait ref with the goal's before passing the assumption to `predicates_for_object_candidate` instead and remove the re-instantiation.

fixes rust-lang/trait-system-refactor-initiative#295

cc @lcnr
Some cleanups around fatal errors and delayed bugs

With the aim of making it easier to move some compiler passes to different locations. And in particular to allow moving them across `has_errors_or_delayed_bugs` calls. This is a prerequisite for a local change that improves the effectiveness of cargo build pipelining.

Fixes rust-lang#152204
…ng_index, r=jieyouxu

fix(traits): Remove expression references from index suggestions

Fix issue: rust-lang#162419
… r=oli-obk

Fix run-make/prune-link-args to work with MinGW

The explanation provided was wrong. Libc doesn't exist on Windows, so naturally this failed on missing lib. I have no idea what shenanigans link.exe does to make this pass, but surely it doesn't actually link libc.
…=Darksonn

doc: Fix external mention of signum() return value regarding NaNs

`is_sign_positive()`/`is_sign_negative()` documentation refer to using `signum() ` but misrepresent the return value of the latter; `signum()` returns a float so it cannot be `false`; `signum()` documentation documents it as returning a NaN in this case, so propagated that to these references.
@rust-bors rust-bors Bot added the rollup A PR which is a rollup label Sep 10, 2026
@rustbot rustbot added 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 S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler 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. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) labels Sep 10, 2026
@JonathanBrouwer

Copy link
Copy Markdown
Member Author

@bors r+ p=5

Trying commonly failed jobs
@bors try jobs=dist-various-1,test-various,test-x86_64-gnu-aux,test-x86_64-gnu-llvm-21-3,test-x86_64-msvc-1,test-aarch64-apple-1,test-aarch64-apple-2,test-x86_64-mingw-1,test-i686-msvc,test-armhf-gnu

@rust-bors

rust-bors Bot commented Sep 10, 2026

Copy link
Copy Markdown
Contributor

📌 Commit cad7a6e has been approved by JonathanBrouwer

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

This comment has been minimized.

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


try-job: dist-various-1
try-job: test-various
try-job: test-x86_64-gnu-aux
try-job: test-x86_64-gnu-llvm-21-3
try-job: test-x86_64-msvc-1
try-job: test-aarch64-apple-1
try-job: test-aarch64-apple-2
try-job: test-x86_64-mingw-1
try-job: test-i686-msvc
try-job: test-armhf-gnu
@rust-bors

This comment has been minimized.

rust-bors Bot pushed a commit that referenced this pull request Sep 10, 2026
…uwer

Rollup of 6 pull requests

Successful merges:

 - #162581 (Subtree sync for rustc_codegen_cranelift)
 - #160831 (re-equate the object bound's trait ref with the goal's when considering object bounds)
 - #162057 (Some cleanups around fatal errors and delayed bugs)
 - #162437 (fix(traits): Remove expression references from index suggestions)
 - #162534 (Fix run-make/prune-link-args to work with MinGW)
 - #162576 (doc: Fix external mention of signum() return value regarding NaNs)
@rust-bors rust-bors Bot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Sep 10, 2026
@rust-bors

rust-bors Bot commented Sep 10, 2026

Copy link
Copy Markdown
Contributor

💔 Test for 9073adf failed: CI. Failed job:

@JonathanBrouwer

Copy link
Copy Markdown
Member Author

@bors retry

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

rust-bors Bot commented Sep 10, 2026

Copy link
Copy Markdown
Contributor

⌛ Testing commit cad7a6e with merge 2dd95b5...

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

rust-bors Bot pushed a commit that referenced this pull request Sep 10, 2026
…uwer

Rollup of 6 pull requests

Successful merges:

 - #162581 (Subtree sync for rustc_codegen_cranelift)
 - #160831 (re-equate the object bound's trait ref with the goal's when considering object bounds)
 - #162057 (Some cleanups around fatal errors and delayed bugs)
 - #162437 (fix(traits): Remove expression references from index suggestions)
 - #162534 (Fix run-make/prune-link-args to work with MinGW)
 - #162576 (doc: Fix external mention of signum() return value regarding NaNs)
@rust-bors rust-bors Bot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Sep 10, 2026
@rust-bors

rust-bors Bot commented Sep 10, 2026

Copy link
Copy Markdown
Contributor

This pull request was unapproved due to being closed.

Auto build was cancelled due to the PR being closed. Cancelled workflows:

@rust-log-analyzer

Copy link
Copy Markdown
Collaborator

A job failed! Check out the build log: (web) (plain enhanced) (plain)

Click to see the possible cause of the failure (guessed by this bot)

@rust-bors

rust-bors Bot commented Sep 10, 2026

Copy link
Copy Markdown
Contributor

☀️ Try build successful (CI)
Build commit: 756762f (756762f13c87793667f9e80d23e35b6364e868e7)
Base parent: c4c4a57 (c4c4a576936e9e67717d0deb8e74e02dd5dd10de)

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

Labels

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 rollup A PR which is a rollup S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. T-compiler Relevant to the compiler 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. 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.

7 participants