Skip to content

[beta] Revert #143031 and #140772 due to #144533 #145456

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
Aug 16, 2025
Merged

[beta] Revert #143031 and #140772 due to #144533 #145456

merged 1 commit into from
Aug 16, 2025
+22 −124

Conversation

mati865
Copy link
Member

@mati865 mati865 commented Aug 15, 2025 •
edited by jieyouxu
Loading

The decision was made in #144659 (comment).
Tracking issue: #145435

r? jieyouxu

try-job: dist-various-1

@rustbot
Copy link
Collaborator

rustbot commented Aug 15, 2025

jieyouxu is currently at their maximum review capacity.
They may take a while to respond.

@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 Aug 15, 2025
@rustbot
Copy link
Collaborator

rustbot commented Aug 15, 2025

Some changes occurred in src/doc/rustc/src/platform-support

cc @Noratrieb

@rustbot

This comment has been minimized.

Sign in to view
@mati865 mati865 changed the title replace version placeholder Revert #143031 and #140772 due to #144533 Aug 15, 2025
@mati865 mati865 force-pushed the revert-beta-gnullvm branch from 21a2c72 to 3042032 Compare August 15, 2025 15:18
@rustbot

This comment was marked as resolved.

Sign in to view
@mati865
Copy link
Member Author

mati865 commented Aug 15, 2025

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.

* [3042032](https://github.com/rust-lang/rust/commit/30420321a3d56ae2efd8cf1689fd4dce06f63aa2)

Huh? Is https://forge.rust-lang.org/compiler/reviews.html?highlight=revert#reverts outdated?

@mati865 mati865 mentioned this pull request Aug 15, 2025
Open
@jieyouxu
Copy link
Member

Honestly, I rather have the context, so I wouldn't worry too much about it.

@jieyouxu jieyouxu added beta-nominated Nominated for backporting to the compiler in the beta channel. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) and removed beta-nominated Nominated for backporting to the compiler in the beta channel. labels Aug 15, 2025
@jieyouxu
Copy link
Member

@bors try

@rust-bors

This comment has been minimized.

Sign in to view
rust-bors bot added a commit that referenced this pull request Aug 15, 2025
@rust-bors
Auto merge of #145456 - mati865:revert-beta-gnullvm, r=<try>
69be3a7 
Revert #143031 and #140772 due to #144533

try-job: dist-various-1
@jieyouxu
Copy link
Member

Bootstrap team beta backport voting in #t-infra/bootstrap/backports > #145456: beta-nominated. Calling this beta-accepted based on voting and also this is a revert not fix-forward.

@rustbot label: +beta-accepted

@rustbot rustbot added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Aug 15, 2025
@jieyouxu jieyouxu changed the title Revert #143031 and #140772 due to #144533 [beta] Revert #143031 and #140772 due to #144533 Aug 15, 2025
@rust-bors
Copy link

rust-bors bot commented Aug 15, 2025

☀️ Try build successful (CI)
Build commit: 69be3a7 (69be3a74e24e2a0dfa17136a41bb6f934edf311f, parent: 96ecc9042cbda2be93f969f2b8dc676964ec8f2c)

jieyouxu
jieyouxu approved these changes Aug 16, 2025
View reviewed changes
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.

Thanks

@jieyouxu
Copy link
Member

@bors r+ rollup=never

@bors
Copy link
Collaborator

bors commented Aug 16, 2025

📌 Commit 3042032 has been approved by jieyouxu

It is now in the queue for this repository.

@bors bors removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 16, 2025
@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Aug 16, 2025
@jieyouxu
Copy link
Member

@bors p=5 (beta backport, a lot of rollup=nevers in queue)

@bors
Copy link
Collaborator

bors commented Aug 16, 2025

⌛ Testing commit 3042032 with merge 630a5f1...

@bors
Copy link
Collaborator

bors commented Aug 16, 2025

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Aug 16, 2025
@bors bors merged commit 630a5f1 into rust-lang:beta Aug 16, 2025
12 checks passed
@rustbot rustbot added this to the 1.90.0 milestone Aug 16, 2025
@jieyouxu jieyouxu removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Aug 16, 2025
@jieyouxu
Copy link
Member

jieyouxu commented Aug 16, 2025 •
edited
Loading

Oh, we need to also adjust relnotes right?

@mati865 mati865 deleted the revert-beta-gnullvm branch August 16, 2025 09:02
@mati865
Copy link
Member Author

mati865 commented Aug 16, 2025

Yeah, #145435 (comment)

We can track it in #145435

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

@jieyouxu jieyouxu jieyouxu approved these changes

Assignees

@jieyouxu jieyouxu

Labels
A-CI Area: Our Github Actions CI A-testsuite Area: The testsuite used to check the correctness of rustc 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-infra Relevant to the infrastructure team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.90.0
Development

Successfully merging this pull request may close these issues.
4 participants
@mati865 @rustbot @jieyouxu @bors