Lifetime variance fixes for clippy#97289
Merged
bors merged 1 commit intorust-lang:masterfrom May 24, 2022
Merged
Conversation
Contributor
|
Some changes occurred in src/tools/clippy. cc @rust-lang/clippy |
Contributor
|
(rust-highfive has picked a reviewer for you, use r? to override) |
This comment has been minimized.
This comment has been minimized.
56f96b8 to
8f8c89a
Compare
Contributor
Author
|
that's an embarrassing copy mistake |
Member
There was a problem hiding this comment.
It looks like this was a search and replace gone wrong?
Member
|
I commented on one case but it looks like there are a few more at least where 'a' is replaced with _tcx in comments etc |
2ae5732 to
8983f54
Compare
Contributor
Author
|
Don't know how every @rustbot ready |
Member
|
r=me modulo comment (either way) |
8983f54 to
215decd
Compare
Contributor
Author
|
@bors r=Mark-Simulacrum |
Collaborator
|
📌 Commit 215decd has been approved by |
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
May 24, 2022
Rollup of 5 pull requests Successful merges: - rust-lang#97240 (Typo suggestion for a variable with a name similar to struct fields) - rust-lang#97289 (Lifetime variance fixes for clippy) - rust-lang#97290 (Turn on `fast_submodules` unconditionally) - rust-lang#97336 (typo) - rust-lang#97337 (Fix stabilization version of `Ipv6Addr::to_ipv4_mapped`) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
flip1995
pushed a commit
to flip1995/rust
that referenced
this pull request
Jun 4, 2022
…rk-Simulacrum Lifetime variance fixes for clippy rust-lang#97287 migrates rustc to a `Ty` type that is invariant over its lifetime `'tcx`, so I need to fix a bunch of places that assume that `Ty<'a>` and `Ty<'b>` can be shortened to some common lifetime. This is doable, since everything is already `'tcx`, so all this PR does is be a bit more explicit that elided lifetimes are actually `'tcx`. Split out from rust-lang#97287 so the clippy team can review independently.
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
8 participants
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.
#97287 migrates rustc to a
Tytype that is invariant over its lifetime'tcx, so I need to fix a bunch of places that assume thatTy<'a>andTy<'b>can be shortened to some common lifetime.This is doable, since everything is already
'tcx, so all this PR does is be a bit more explicit that elided lifetimes are actually'tcx.Split out from #97287 so the clippy team can review independently.