Skip to content

Conversation

lambdageek
Copy link
Contributor

@lambdageek lambdageek commented Sep 17, 2025

This reverts #146018 due to #146693

@rustbot rustbot added A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. 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. labels Sep 17, 2025
@lambdageek lambdageek marked this pull request as ready for review September 17, 2025 22:56
@rustbot
Copy link
Collaborator

rustbot commented Sep 17, 2025

Some changes occurred in compiler/rustc_codegen_ssa

cc @WaffleLapkin

These commits modify the Cargo.lock file. Unintentional changes to Cargo.lock can be introduced when switching branches and rebasing PRs.

If this was unintentional then you should revert the changes before this PR is merged.
Otherwise, you can ignore this comment.

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Sep 17, 2025
@rustbot
Copy link
Collaborator

rustbot commented Sep 17, 2025

r? @jieyouxu

rustbot has assigned @jieyouxu.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@jieyouxu
Copy link
Member

Is there a reason is this a beta-only revert, instead of also reverting on master? The affected user will still have broken master builds, no?

@jieyouxu jieyouxu added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Sep 18, 2025
@jieyouxu
Copy link
Member

Or is the intention to fix-forward on master with #146663?

@wesleywiser
Copy link
Member

@jieyouxu I think the forward fix will be #146689.

@apiraino
Copy link
Contributor

Beta backport accepted as per compiler team on Zulip. A backport PR will be authored by the release team at the end of the current development cycle. Backport labels handled by them.

@rustbot label +beta-accepted

@rustbot rustbot added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Sep 18, 2025
Copy link
Member

@jieyouxu jieyouxu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jieyouxu
Copy link
Member

@bors r+ rollup=never

@bors
Copy link
Collaborator

bors commented Sep 18, 2025

📌 Commit 6347e7f has been approved by jieyouxu

It is now in the queue for this repository.

@bors bors 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 18, 2025
@jieyouxu
Copy link
Member

Giving this a small p=1 bump because beta revert.
@bors p=1

bors added a commit that referenced this pull request Sep 19, 2025
[beta] Revert "compiler: Add Windows resources to rustc-main and rustc_driver"

This reverts #146018 due to #146693
@bors
Copy link
Collaborator

bors commented Sep 19, 2025

⌛ Testing commit 6347e7f with merge 345b55d...

@Zalathar
Copy link
Contributor

One of the jobs flaked out and stopped making progress, hours ago. 😿

@bors retry

@bors
Copy link
Collaborator

bors commented Sep 19, 2025

⌛ Testing commit 6347e7f with merge b34cfaf...

@bors
Copy link
Collaborator

bors commented Sep 19, 2025

☀️ Test successful - checks-actions
Approved by: jieyouxu
Pushing b34cfaf to beta...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 19, 2025
@bors bors merged commit b34cfaf into rust-lang:beta Sep 19, 2025
11 checks passed
@rustbot rustbot added this to the 1.91.0 milestone Sep 19, 2025
@cuviper cuviper removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Sep 19, 2025
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. beta-accepted Accepted for backporting to the compiler in the beta channel. merged-by-bors This PR was explicitly merged by bors. 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-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants