Diagnose anonymous lifetimes errors more uniformly between async and regular fns #97023
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
rustbot
added
the
T-compiler
rust-highfive
added
the
S-waiting-on-review
This comment has been minimized.
This comment has been minimized.
cjgillot
force-pushed
the
uniform-anon
branch
3 times, most recently
from
f66f4fd
to
62f7854
Compare
|
☔ The latest upstream changes (presumably #97258) made this pull request unmergeable. Please resolve the merge conflicts. |
estebank
reviewed
May 24, 2022
estebank
reviewed
May 24, 2022
| LL | &'a self, foo: &dyn Foo | ||
| | - let's call the lifetime of this reference `'1` | ||
| | -------- help: add explicit lifetime `'a` to the type of `foo`: `&'a (dyn Foo + 'a)` |
estebank
reviewed
May 24, 2022
src/test/ui/async-await/issue-75785-confusing-named-region.stderr
Outdated
Show resolved
Hide resolved
estebank
reviewed
May 24, 2022
estebank
reviewed
May 24, 2022
cjgillot
force-pushed
the
uniform-anon
branch
2 times, most recently
from
a28aeaf
to
58cceeb
Compare
This comment has been minimized.
This comment has been minimized.
|
@bors r+ |
|
📌 Commit 0cf79d7 has been approved by |
bors
added
S-waiting-on-bors
Dylan-DPC
added a commit
to Dylan-DPC/rust
that referenced
this pull request
Jun 1, 2022
Diagnose anonymous lifetimes errors more uniformly between async and regular fns Async fns and regular fns are desugared differently. For the former, we create a generic parameter at HIR level. For the latter, we just create an anonymous region for typeck. I plan to migrate regular fns to the async fn desugaring. Before that, this PR attempts to merge the diagnostics for both cases. r? `@estebank`
Dylan-DPC
added a commit
to Dylan-DPC/rust
that referenced
this pull request
Jun 2, 2022
Diagnose anonymous lifetimes errors more uniformly between async and regular fns Async fns and regular fns are desugared differently. For the former, we create a generic parameter at HIR level. For the latter, we just create an anonymous region for typeck. I plan to migrate regular fns to the async fn desugaring. Before that, this PR attempts to merge the diagnostics for both cases. r? ``@estebank``
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jun 2, 2022
Rollup of 6 pull requests Successful merges: - rust-lang#96894 (Apply track_caller to closure on `expect_non_local()`) - rust-lang#97023 (Diagnose anonymous lifetimes errors more uniformly between async and regular fns) - rust-lang#97397 (Stabilize `box_into_pin`) - rust-lang#97587 (Migrate more diagnostics to use the `#[derive(SessionDiagnostic)]`) - rust-lang#97603 (Arc make_mut doc comment spelling correction.) - rust-lang#97635 (Fix file metadata documentation for Windows) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
jackh726
reviewed
Jun 4, 2022
| // If we want to print verbosely, then print *all* binders, even if they | ||
| // aren't named. Eventually, we might just want this as the default, but | ||
| // this is not *quite* right and changes the ordering of some output | ||
| // anyways. | ||
| let (new_value, map) = if self.tcx().sess.verbose() { | ||
| // anon index + 1 (BrEnv takes 0) -> name | ||
| let mut region_map: BTreeMap<u32, Symbol> = BTreeMap::default(); | ||
| let mut region_map: FxHashMap<_, _> = Default::default(); |
There was a problem hiding this comment.
This code is a bit sus to me. This relies on us not having duplicate BoundRegionKinds in binders. This is how the compiler behaves today (or should barring bugs), but there isn't nothing to say that we can't (you could, for example, imagine that we drop the anon index).
This makes more sense as just a Vec where each index is just the BoundRegionKind that corresponds to the binder (or just some placeholder value for non-regions) and then use BoundRegion.var.as_usize() as an index into that vec, which is exactly how bound variables work.
(I'm making these changes currently for the bug below).
Comment on lines
-2224
to
+2220
| let kind = match br.kind { | ||
| ty::BrNamed(_, _) => br.kind, | ||
| ty::BrAnon(i) => { | ||
| let name = region_map[&(i + 1)]; | ||
| ty::BrNamed(CRATE_DEF_ID.to_def_id(), name) | ||
| } | ||
| ty::BrEnv => { | ||
| let name = region_map[&0]; | ||
| ty::BrNamed(CRATE_DEF_ID.to_def_id(), name) | ||
| } | ||
| }; | ||
| let kind = region_map[&br.kind]; |
There was a problem hiding this comment.
This broke cases under -Zverbose where we try to print a named bound region. Above, we don't insert them in the region_map but here we try to lookup the variable anyways.
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Jun 4, 2022
…x, r=compiler-errors Fix pretty printing named bound regions under -Zverbose Fixed regression introduced in rust-lang#97023 r? `@compiler-errors` cc `@cjgillot`
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.
Async fns and regular fns are desugared differently. For the former, we create a generic parameter at HIR level. For the latter, we just create an anonymous region for typeck.
I plan to migrate regular fns to the async fn desugaring.
Before that, this PR attempts to merge the diagnostics for both cases.
r? @estebank