Fix elided lifetimes shown as '_ on async functions
#80319
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
jyn514
added
T-rustdoc
rust-highfive
added
the
S-waiting-on-review
jyn514
force-pushed
the
async-lifetimes
branch
from
7862711
to
25b628b
Compare
jyn514
commented
Dec 23, 2020
|
|
||
| impl Foo { | ||
| // @has async_fn/struct.Foo.html | ||
| // @has - '//h4[@class="method"]' 'pub async fn complicated_lifetimes( &self, context: &impl Bar) -> impl Iterator<Item = &usize>' |
There was a problem hiding this comment.
The test suite normalizes this really strangely; the original is
This comment has been minimized.
This comment has been minimized.
jyn514
force-pushed
the
async-lifetimes
branch
from
25b628b
to
530c33c
Compare
tmandry
reviewed
Dec 23, 2020
| // Turning `fn f(&'_ self)` into `fn f(&self)` isn't the worst thing in the world, though; | ||
| // there's no case where it could cause the function to fail to compile. | ||
| let elided = | ||
| l.is_elided() || matches!(l.name, LifetimeName::Param(ParamName::Fresh(_))); |
There was a problem hiding this comment.
I'm surprised that there are two possible ways we need to handle, when is it one versus the other? (Which test cases fail without one of these?)
There was a problem hiding this comment.
Fresh params aren't considered elided in rustc itself: https://doc.rust-lang.org/nightly/nightly-rustc/src/rustc_hir/hir.rs.html#130-143. Almost every test fails without this, the only thing GenericParam changes is removing the bogus fn f<'_>.
If you notice above, it was already checking is_elided, just not Fresh.
There was a problem hiding this comment.
Ah I see. That makes me wonder if we should push this change up to is_elided(), but that might have other side effects.
Darksonn
reviewed
Dec 23, 2020
jyn514
force-pushed
the
async-lifetimes
branch
from
5eda9c2
to
ceb66ad
Compare
|
@bors r+ |
|
📌 Commit ceb66ad has been approved by |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Dec 25, 2020
Rollup of 11 pull requests Successful merges: - rust-lang#79213 (Stabilize `core::slice::fill`) - rust-lang#79999 (Refactored verbose print into a function) - rust-lang#80160 (Implemented a compiler diagnostic for move async mistake) - rust-lang#80274 (Rename rustc_middle::lint::LintSource) - rust-lang#80280 (Add installation commands to `x` tool README) - rust-lang#80319 (Fix elided lifetimes shown as `'_` on async functions) - rust-lang#80327 (Updated the match with the matches macro) - rust-lang#80330 (Fix typo in simplify_try.rs) - rust-lang#80340 (Don't unnecessarily override attrs for Module) - rust-lang#80342 (Fix typo) - rust-lang#80352 (BTreeMap: make test cases more explicit on failure) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
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.
Closes #63037.
r? @tmandry on the implementation, @Darksonn on the test cases.