Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fail gracefully when encountering an HRTB in APIT. #97683

Merged
merged 1 commit into from
Jun 6, 2022

Conversation

cjgillot
Copy link
Contributor

@cjgillot cjgillot commented Jun 3, 2022

Fixes #96954

The first commit will be merged as part of #97415

@rust-highfive
Copy link
Collaborator

Some changes occurred in src/tools/clippy.

cc @rust-lang/clippy

@rustbot rustbot added T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. labels Jun 3, 2022
@rust-highfive
Copy link
Collaborator

r? @nagisa

(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 Jun 3, 2022
@rust-log-analyzer

This comment has been minimized.

@nagisa
Copy link
Member

nagisa commented Jun 5, 2022

@bors r+

@bors
Copy link
Contributor

bors commented Jun 5, 2022

📌 Commit bacd8ad has been approved by nagisa

@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 Jun 5, 2022
@nagisa nagisa added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jun 5, 2022
@nagisa
Copy link
Member

nagisa commented Jun 5, 2022

This is a correct error in stable and ICE in beta, so nominating for a backport. Not super important that it is accepted, though.

matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jun 5, 2022
Fail gracefully when encountering an HRTB in APIT.

Fixes rust-lang#96954

~The first commit will be merged as part of rust-lang#97415
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 6, 2022
…askrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#90905 (Add empty impl blocks if they have documentation)
 - rust-lang#97683 (Fail gracefully when encountering an HRTB in APIT. )
 - rust-lang#97721 (Do `suggest_await_before_try` with infer variables in self, and clean up binders)
 - rust-lang#97752 (typo: `-Zcodegen-backend=llvm -Cpasses=list` should work now)
 - rust-lang#97759 (Suggest adding `{}` for `'label: non_block_expr`)
 - rust-lang#97764 (use strict provenance APIs)
 - rust-lang#97765 (Restore a test that was intended to test `as` cast to ptr)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit f2b3808 into rust-lang:master Jun 6, 2022
@rustbot rustbot added this to the 1.63.0 milestone Jun 6, 2022
@cjgillot cjgillot deleted the no-apit-hrtb branch June 6, 2022 15:12
@apiraino apiraino removed the T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. label Jun 8, 2022
@apiraino
Copy link
Contributor

apiraino commented Jun 9, 2022

Beta backport accepted 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 Jun 9, 2022
@ehuss
Copy link
Contributor

ehuss commented Jun 24, 2022

@cjgillot This does not apply cleanly to beta. The region_def_id parameter of the resolve_lifetime_ref doesn't exist (it was added in #97415), and I'm reluctant to try to bring in the changes necessary for that. Can you perhaps prepare a backport with the necessary changes? (Or decide if this isn't important enough to bother with.) Just FYI the release train leaves on Monday.

bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 26, 2022
…mulacrum

[beta] Fail gracefully when encountering an HRTB in APIT.

Backport of rust-lang#97683
The diagnostic is a bit worse, but still better than an ICE.

r? `@ehuss`
@pietroalbini pietroalbini removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jun 27, 2022
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.

[ICE] Unresolved HRTB lifetime in APIT
9 participants