Skip to content

Conversation

compiler-errors
Copy link
Member

@compiler-errors compiler-errors commented Jan 12, 2023

This reverts commit e2d41f4, and adjusts the tests/ui/async-await/in-trait/nested-rpit.rs test.

r? @cjgillot

fixes #106332, manually verified because it had no minimization :/

reopens #105197
cc #106729
cc #106630

@compiler-errors compiler-errors added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jan 12, 2023
@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 12, 2023
@apiraino
Copy link
Contributor

Beta backport approved as per compiler team on Zulip.

@rustbot label +beta-accepted

@rustbot rustbot added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Jan 12, 2023
@cjgillot
Copy link
Contributor

I agree that this revert is the better thing to do. #106729 definitely needs a bit more work before landing, and is not acceptable for beta.

@bors r+

@bors
Copy link
Collaborator

bors commented Jan 12, 2023

📌 Commit 0a2b55d has been approved by cjgillot

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 12, 2023
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 12, 2023
Rollup of 8 pull requests

Successful merges:

 - rust-lang#105795 (Stabilize `abi_efiapi` feature)
 - rust-lang#106446 ([LSDA] Take ttype_index into account when taking unwind action)
 - rust-lang#106675 (Mark ZST as FFI-safe if all its fields are PhantomData)
 - rust-lang#106740 (Adding a hint on iterator type errors)
 - rust-lang#106741 (Fix reexport of `doc(hidden)` item)
 - rust-lang#106759 (Revert "Make nested RPITIT inherit the parent opaque's generics.")
 - rust-lang#106772 (Re-add mw to review rotation)
 - rust-lang#106778 (Exclude formatting commit from blame)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit bbb2a22 into rust-lang:master Jan 13, 2023
@rustbot rustbot added this to the 1.68.0 milestone Jan 13, 2023
@Mark-Simulacrum Mark-Simulacrum removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jan 19, 2023
@Mark-Simulacrum Mark-Simulacrum modified the milestones: 1.68.0, 1.67.0 Jan 19, 2023
@pnkfelix
Copy link
Contributor

for reference, this reverts PR #105255

bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 20, 2023
…mulacrum

[beta] backport rollup

* Revert "Make nested RPITIT inherit the parent opaque's generics." rust-lang#106759
*  Fix mpsc::SyncSender spinning behavior rust-lang#106701
*  rustdoc: fix outdated lint section of the book rust-lang#106605
*  Do not filter substs in remap_generic_params_to_declaration_params. rust-lang#106503
*  Correct detection of elided lifetimes in impl-trait. rust-lang#106501
*  Bump rust-installer rust-lang#106196
*  Don't panic on stable since miri is not available there rust-lang#105901
@compiler-errors compiler-errors deleted the revert-105255 branch August 11, 2023 20:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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-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.

Borrow checker error on nightly even when the type is 'static
7 participants