Skip to content

[beta] Revert #92519 on beta#96556

Closed
ChrisDenton wants to merge 1 commit intorust-lang:betafrom
ChrisDenton:revert-92519
Closed

[beta] Revert #92519 on beta#96556
ChrisDenton wants to merge 1 commit intorust-lang:betafrom
ChrisDenton:revert-92519

Conversation

@ChrisDenton
Copy link
Member

@ChrisDenton ChrisDenton commented Apr 29, 2022

This reverts #92519 because I think #95246 should land in the same Rust version and I also think it would be wise for this change to have a bit more time to bake considering it's insta-stable.

@ChrisDenton
Revert "Rollup merge of rust-lang#92519 - ChrisDenton:command-maybe-v…
7ae2017 
…erbatim, r=dtolnay"

This reverts commit ba2d5ed, reversing
changes made to 9b701e7.
@ChrisDenton ChrisDenton added O-windows Operating system: Windows beta-nominated Nominated for backporting to the compiler in the beta channel. T-libs-api Relevant to the library API team, which will review and decide on the PR/issue. labels Apr 29, 2022
@rust-highfive
Copy link
Contributor

rust-highfive commented Apr 29, 2022

Hey! It looks like you've submitted a new PR for the library teams!

If this PR contains changes to any rust-lang/rust public library APIs then please comment with r? rust-lang/libs-api @rustbot label +T-libs-api -T-libs to request review from a libs-api team reviewer. If you're unsure where your change falls no worries, just leave it as is and the reviewer will take a look and make a decision to forward on if necessary.

Examples of T-libs-api changes:

  • Stabilizing library features
  • Introducing insta-stable changes such as new implementations of existing stable traits on existing stable types
  • Introducing new or changing existing unstable library APIs (excluding permanently unstable features / features without a tracking issue)
  • Changing public documentation in ways that create new stability guarantees
  • Changing observable runtime behavior of library APIs

@rust-highfive
Copy link
Contributor

rust-highfive commented Apr 29, 2022

r? @joshtriplett

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

@rust-highfive
Copy link
Contributor

rust-highfive commented Apr 29, 2022

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

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 29, 2022
@the8472
Copy link
Member

the8472 commented Apr 29, 2022

Odd, shouldn't beta commits go to master first? There's the ensure backported commits are in upstream branches CI step but it passes.

@Mark-Simulacrum
Copy link
Member

Mark-Simulacrum commented Apr 29, 2022

We're not currently enforcing that step (it's just been broken in a passing state since addition), but this particular revert isn't needed on master - #95246 fixes the bug which motivates this revert and has already landed on master.

@joshtriplett
Copy link
Member

joshtriplett commented Apr 29, 2022

Seems reasonable to me. The original went through an FCP; I don't think delaying it by one release needs that, though.

@Mark-Simulacrum Mark-Simulacrum changed the title Revert #92519 on beta [beta] Revert #92519 on beta Apr 30, 2022
@Mark-Simulacrum
Copy link
Member

Mark-Simulacrum commented Apr 30, 2022

@bors rollup=never (targeting beta)

@m-ou-se m-ou-se added the beta-accepted Accepted for backporting to the compiler in the beta channel. label May 4, 2022
@Mark-Simulacrum Mark-Simulacrum removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label May 13, 2022
@Mark-Simulacrum Mark-Simulacrum added this to the 1.61.0 milestone May 13, 2022
@Mark-Simulacrum Mark-Simulacrum mentioned this pull request May 13, 2022
Merged
@Mark-Simulacrum
Copy link
Member

Mark-Simulacrum commented May 13, 2022

Bundled into #97014.

bors added a commit to rust-lang-ci/rust that referenced this pull request May 14, 2022
@bors
Auto merge of rust-lang#97014 - Mark-Simulacrum:beta-next, r=Mark-Sim…
eb1e588 
…ulacrum

[beta] backports

This backports/rolls up:

*  Quick fix for rust-lang#96223. rust-lang#96679
*  [beta] Revert rust-lang#92519 on beta rust-lang#96556
*  [beta] Clippy backport ICE/infinite loop fix rust-lang#96740
*  Revert "Prefer projection candidates instead of param_env candidates for Sized predicates" rust-lang#96593
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@joshtriplett joshtriplett

Labels

beta-accepted Accepted for backporting to the compiler in the beta channel. O-windows Operating system: Windows S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-libs-api Relevant to the library API team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.61.0

Development

Successfully merging this pull request may close these issues.

6 participants

@ChrisDenton @rust-highfive @the8472 @Mark-Simulacrum @joshtriplett @m-ou-se