Paper over an accidental regression #115844
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
oli-obk
added
the
beta-nominated
rustbot
added
S-waiting-on-review
jackh726
reviewed
Sep 14, 2023
| @@ -8,7 +8,7 @@ fn without_lt() -> impl for<'a> Trait<'a, Assoc = WithoutLt> {} | |||
| //~^ ERROR captures lifetime that does not appear in bounds | |||
|
|
|||
| type WithLt<'a> = impl Sized + 'a; | |||
| //~^ ERROR concrete type differs from previous defining opaque type use | |||
|
|
|||
There was a problem hiding this comment.
Why does this disappear? It's a TAIT, not RPIT?
There was a problem hiding this comment.
it's used in an RPIT right below
| @@ -461,7 +461,15 @@ fn check_opaque_meets_bounds<'tcx>( | |||
| } | |||
| match origin { | |||
| // Checked when type checking the function containing them. | |||
| hir::OpaqueTyOrigin::FnReturn(..) | hir::OpaqueTyOrigin::AsyncFn(..) => {} | |||
| hir::OpaqueTyOrigin::FnReturn(..) | hir::OpaqueTyOrigin::AsyncFn(..) => { | |||
There was a problem hiding this comment.
Wondering if AsyncFn should continue to fall through?
There was a problem hiding this comment.
hmm true. But this is a revert of any stable effects of my old PR, there may be a repro with async fn
There was a problem hiding this comment.
Ah yeah, my mind jumped directly to AFITs, not even thinking about standalone functions.
|
@bors r+ |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Sep 14, 2023
…iaskrgr Rollup of 4 pull requests Successful merges: - rust-lang#115772 (Improve Span in smir) - rust-lang#115832 (Fix the error message for `#![feature(no_coverage)]`) - rust-lang#115834 (Properly consider binder vars in `HasTypeFlagsVisitor`) - rust-lang#115844 (Paper over an accidental regression) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Sep 14, 2023
Rollup merge of rust-lang#115844 - oli-obk:opaque_lifetime_ambiguity, r=jackh726 Paper over an accidental regression r? types cc rust-lang#115781 (do not close issue until beta backport has been performed) The PR reasons are explained with comments in the source. In order to keep the diff simple, this PR effectively reverts rust-lang#113661, but only for RPITs. I will submit a follow up PR that fixes this correctly instead of just disabling the newly added check for RPITs. This PR should be significantly easier to review for beta backport
rustbot
added
the
beta-accepted
Merged
cuviper
removed
the
beta-nominated
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Sep 22, 2023
[beta] backports - Fix a pthread_t handle leak rust-lang#114696 - MCP661: Move wasm32-wasi-preview1-threads target to Tier 2 rust-lang#115345 - Don't modify libstd to dump rustc ICEs rust-lang#115627 - Paper over an accidental regression rust-lang#115844 - Update to LLVM 17.0.0 rust-lang#115959 r? cuviper
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
r? types
cc #115781 (do not close issue until beta backport has been performed)
The PR reasons are explained with comments in the source.
In order to keep the diff simple, this PR effectively reverts #113661, but only for RPITs. I will submit a follow up PR that fixes this correctly instead of just disabling the newly added check for RPITs. This PR should be significantly easier to review for beta backport