Skip to content

Revert accidental stabilization#94805

Merged
bors merged 1 commit intorust-lang:masterfrom
oli-obk:drop_box
Mar 10, 2022
Merged

Revert accidental stabilization#94805
bors merged 1 commit intorust-lang:masterfrom
oli-obk:drop_box

Conversation

@oli-obk
Copy link
Contributor

@oli-obk oli-obk commented Mar 10, 2022

fixes #94804

@oli-obk oli-obk added beta-nominated Nominated for backporting to the compiler in the beta channel. stable-nominated Nominated for backporting to the compiler in the stable channel. labels Mar 10, 2022
@rustbot rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Mar 10, 2022
@rust-highfive
Copy link
Contributor

rust-highfive commented Mar 10, 2022

r? @Mark-Simulacrum

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 10, 2022
@Dylan-DPC
Copy link
Member

Dylan-DPC commented Mar 10, 2022

r? @Dylan-DPC

@pnkfelix
Copy link
Contributor

pnkfelix commented Mar 10, 2022

@bors r+

@bors
Copy link
Collaborator

bors commented Mar 10, 2022

📌 Commit 5f7ca55 has been approved by pnkfelix

@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 Mar 10, 2022
@matthiaskrgr matthiaskrgr mentioned this pull request Mar 10, 2022
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 10, 2022
@bors
Auto merge of rust-lang#94814 - matthiaskrgr:rollup-a5sk366, r=matthi…
5f4e067 
…askrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#94440 (Better error for normalization errors from parent crates that use `#![feature(generic_const_exprs)]`)
 - rust-lang#94587 (Document new recommended use of `FromIterator::from_iter`)
 - rust-lang#94644 (Fix soundness issue in scoped threads.)
 - rust-lang#94740 (Unify impl blocks by wrapping them into a div)
 - rust-lang#94753 (Improve rustdoc book)
 - rust-lang#94796 (Allow `cargo run` instead of `cargo run -p bootstrap`)
 - rust-lang#94805 (Revert accidental stabilization)
 - rust-lang#94809 (RustWrapper: add missing include)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@jhpratt
Copy link
Member

jhpratt commented Mar 10, 2022

Why did #[rustc_const_unstable] not work here?

@oli-obk oli-obk closed this Mar 10, 2022
@oli-obk
Copy link
Contributor Author

oli-obk commented Mar 10, 2022

Butterfingers on mobile, didn't want to close

@oli-obk oli-obk reopened this Mar 10, 2022
@oli-obk
Copy link
Contributor Author

oli-obk commented Mar 10, 2022

I think it was a weird combination of Drop being special and not actually being called, so the checks failed because they were not actually hit.

@Dylan-DPC
Copy link
Member

Dylan-DPC commented Mar 10, 2022

i don't think it needs a re-r+ but just in case

@bors r+

@bors
Copy link
Collaborator

bors commented Mar 10, 2022

💡 This pull request was already approved, no need to approve it again.

@bors
Copy link
Collaborator

bors commented Mar 10, 2022

📌 Commit 5f7ca55 has been approved by Dylan-DPC

@bors bors merged commit af35dc2 into rust-lang:master Mar 10, 2022
@rustbot rustbot added this to the 1.61.0 milestone Mar 10, 2022
@apiraino apiraino added T-libs Relevant to the library team, which will review and decide on the PR/issue. and removed T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Mar 16, 2022
@apiraino
Copy link
Contributor

apiraino commented Mar 16, 2022

switched team label because (if I am not mistaken) the changes seems more relevant to t-libs, so I thought they should decide on the backport. But in case it can be discussed also tomorrow during T-compiler team

@apiraino
Copy link
Contributor

apiraino commented Mar 17, 2022

Beta and stable backports accepted as per compiler team on Zulip

@rustbot label +beta-accepted +stable-accepted

@rustbot rustbot added beta-accepted Accepted for backporting to the compiler in the beta channel. stable-accepted Accepted for backporting to the compiler in the stable channel. labels Mar 17, 2022
@cuviper cuviper mentioned this pull request Mar 18, 2022
Merged
@cuviper cuviper modified the milestones: 1.61.0, 1.60.0 Mar 18, 2022
@cuviper cuviper removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Mar 18, 2022
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 18, 2022
@bors
Auto merge of rust-lang#95061 - cuviper:beta-stage0, r=Mark-Simulacrum
6ee5a40 
[beta] backports + bootstrap bump

Add pending backports:

* Revert accidental stabilization rust-lang#94805
* Do not recover from Ty? in macro parsing rust-lang#94593
* Fix cmake build. rust-lang#95050

And updates the bootstrap compiler to 1.59.0.
@Mark-Simulacrum Mark-Simulacrum removed stable-nominated Nominated for backporting to the compiler in the stable channel. stable-accepted Accepted for backporting to the compiler in the stable channel. labels Jul 15, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@Dylan-DPC Dylan-DPC

Labels

beta-accepted Accepted for backporting to the compiler in the beta channel. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-libs Relevant to the library team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.60.0

Development

Successfully merging this pull request may close these issues.

1.59 accidentally stabilized dropping Box<T>s in const fns

10 participants

@oli-obk @rust-highfive @Dylan-DPC @pnkfelix @bors @jhpratt @apiraino @cuviper @Mark-Simulacrum @rustbot