Skip to content
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.

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

[beta] Revert trait obj upcast stabilization #120269

Merged
merged 2 commits into from
Jan 24, 2024

Conversation

oli-obk
Copy link
Contributor

@oli-obk oli-obk commented Jan 23, 2024

backport of #120233

note that this is not yet approved for beta backport

@rustbot
Copy link
Collaborator

rustbot commented Jan 23, 2024

r? @b-naber

(rustbot has picked a reviewer for you, use r? to override)

@rustbot
Copy link
Collaborator

rustbot commented Jan 23, 2024

⚠️ Warning ⚠️

  • Pull requests are usually filed against the master branch for this repo, but this one is against beta. Please double check that you specified the right target!

@rustbot rustbot added 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. labels Jan 23, 2024
@rustbot
Copy link
Collaborator

rustbot commented Jan 23, 2024

The Miri subtree was changed

cc @rust-lang/miri

@rust-log-analyzer

This comment has been minimized.

@oli-obk oli-obk force-pushed the revert_trait_obj_upcast_stabilization branch from 83de3cb to 9bc7360 Compare January 24, 2024 08:32
@rustbot
Copy link
Collaborator

rustbot commented Jan 24, 2024

The Miri subtree was changed

cc @rust-lang/miri

@rust-log-analyzer

This comment has been minimized.

@oli-obk oli-obk force-pushed the revert_trait_obj_upcast_stabilization branch from 9bc7360 to 3a638f7 Compare January 24, 2024 08:55
@oli-obk
Copy link
Contributor Author

oli-obk commented Jan 24, 2024

@bors r=jackh726

@bors
Copy link
Contributor

bors commented Jan 24, 2024

📌 Commit 3a638f7 has been approved by jackh726

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 Jan 24, 2024
@fmease
Copy link
Member

fmease commented Jan 24, 2024

@bors rollup=never

@oli-obk
Copy link
Contributor Author

oli-obk commented Jan 24, 2024

@bors p=1 let's land this as early as possible before the stable cut

@fmease
Copy link
Member

fmease commented Jan 24, 2024

@bors p=20 to jump ahead of the next rollup and since this fixes a P-critical soundness issue.

@bors
Copy link
Contributor

bors commented Jan 24, 2024

⌛ Testing commit 3a638f7 with merge e9e69c6...

bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 24, 2024
…ilization, r=jackh726

[beta] Revert trait obj upcast stabilization

backport of rust-lang#120233

note that this is not yet approved for beta backport
@bors
Copy link
Contributor

bors commented Jan 24, 2024

💥 Test timed out

@bors bors 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 Jan 24, 2024
@oli-obk
Copy link
Contributor Author

oli-obk commented Jan 24, 2024

@bors retry timeout

@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 Jan 24, 2024
@bors
Copy link
Contributor

bors commented Jan 24, 2024

⌛ Testing commit 3a638f7 with merge a27ad23...

@rust-log-analyzer
Copy link
Collaborator

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

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

@bors
Copy link
Contributor

bors commented Jan 24, 2024

☀️ Test successful - checks-actions
Approved by: jackh726
Pushing a27ad23 to beta...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jan 24, 2024
@bors bors merged commit a27ad23 into rust-lang:beta Jan 24, 2024
12 checks passed
@rustbot rustbot added this to the 1.76.0 milestone Jan 24, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 12, 2024
…k-Simulacrum

[Beta 1.77] Fix bootstrapping from 1.76

Due to the timing of the revert for stabilization of c_str_literal (rust-lang#119528 which reverted in 1.76) and trait_upcasting (rust-lang#120269 which reverted in 1.76), which happened after rust-lang#119211 (Bump stage0 to 1.76 beta), this resulted in some of the feature attributes not being restored which are needed to be able to bootstrap from 1.76. This restores those features.

This also includes a stage0 bump to the just released stable. This is necessary because stage0 was currently pointing at an old beta which did not contain the reverts.

Fixes rust-lang#120810
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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-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.

6 participants