Skip to content

Conversation

@mati865
Copy link
Member

@mati865 mati865 commented Dec 3, 2025

Revert #149516 because it caused dist to pick up x86_64 libwinpthreads.dll dependency, resulting in broken toolchain.

Note, I didn't use the procedure explained at: https://forge.rust-lang.org/compiler/reviews.html#reverts because the revert button isn't there.

This reverts commit 5afd8ff, reversing
changes made to 7cb02f9.

Revert rust-lang#149516 because it caused dist to pick up x86_64
`libwinpthreads.dll` dependency, resulting in broken toolchain.
@rustbot rustbot added A-CI Area: Our Github Actions CI A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. labels Dec 3, 2025
@rustbot
Copy link
Collaborator

rustbot commented Dec 3, 2025

⚠️ Warning ⚠️

  • There are issue links (such as #123) in the commit messages of the following commits.
    Please move them to the PR description, to avoid spamming the issues with references to the commit, and so this bot can automatically canonicalize them to avoid issues with subtree.

Copy link
Member

@Kivooeo Kivooeo left a comment

Choose a reason for hiding this comment

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

This revert looks good to me (except issue link in commit). It just rolls back to what was already working. Do you want a specific review from Jieyou?

View changes since this review

@mati865
Copy link
Member Author

mati865 commented Dec 3, 2025

Thanks.
He reviewed the previous PR , so I wanted to let him know about the revert.

Regarding the commit message, I asked about it in #145456 (comment) and the response was to keep it.

Increasing priority per https://forge.rust-lang.org/compiler/reviews.html#priority

@bors p=5

(It can be included in rollups)

@tgross35
Copy link
Contributor

tgross35 commented Dec 3, 2025

The toolchain is broken so we should get this in,

@bors r=Kivooeo,tgross35

If you get the chance, it would be nice to add this bit to the message:

This reverts commit 985933c5806c18741cc07431a6c7eb14bbf67677, reversing
changes made to 2fb805367dd3012ce5c50865d03c86e70bf10f0f.

(assuming that's the right commit) which is part of what git does automatically and in the rustc-dev-guide. Just to avoid digging up the PR to see which commit got undone.

@bors
Copy link
Collaborator

bors commented Dec 3, 2025

📌 Commit 83459c6 has been approved by Kivooeo,tgross35

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 Dec 3, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-CI Area: Our Github Actions CI A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants