[beta] Revert #113923

[dianqk]

Per #t-compiler/meetings > [weekly] 2024-01-11 discussion, revert #113923. Also revert associated #118568.

The PR #113923 causes the regression issue #118609. We need more time to find a proper solution.

Discussions start at 412365838 and continue to 412369643.

Fixes #118609.

Same as #119885 but backported to beta.

r? compiler

[rustbot]

⚠️ 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]

The Miri subtree was changed

cc @rust-lang/miri

[dianqk]

@rustbot label +beta-nominated +beta-accepted

[rustbot]

Error: Label beta-accepted can only be set by Rust team members

Please file an issue on GitHub at triagebot if there's a problem with this bot, or reach out on #t-infra on Zulip.

[dianqk]

@rustbot label +beta-nominated

[apiraino]

Beta backport accepted as per compiler team on Zulip

@rustbot label +beta-accepted

[weihanglo]

I've created another beta backport PR #120111. Feel free to roll them up :)

[cuviper]

Procedural note: we normally deal with backport flags on the master PR, especially because it doesn't show up in the release team's queries until merged. That's kind of a chicken-and-egg situation when you're already targeting beta. Then we may ask for help backporting if there's some conflict, but generally we can handle it. :)

https://forge.rust-lang.org/release/backporting.html

Anyway, no worries, I've verified that this is a clean match of #119885.

@bors r+ rollup=never

[bors]

📌 Commit 251322e has been approved by cuviper

It is now in the queue for this repository.

[dianqk]

Procedural note: we normally deal with backport flags on the master PR, especially because it doesn't show up in the release team's queries until merged. That's kind of a chicken-and-egg situation when you're already targeting beta. Then we may ask for help backporting if there's some conflict, but generally we can handle it. :)

https://forge.rust-lang.org/release/backporting.html

Anyway, no worries, I've verified that this is a clean match of #119885.

@bors r+ rollup=never

Thanks, I got it. I just need to add the beta-nominated to the PR of the target master branch.
(Based on the discussion at the meeting I assumed this was already in beta-accepted, so I submitted the PR.)

[bors]

⌛ Testing commit 251322e with merge a2411cb...

[bors]

☀️ Test successful - checks-actions
Approved by: cuviper
Pushing a2411cb to beta...