Tighten span when suggesting lifetime on path #92333
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
rustbot
added
the
T-compiler
rust-highfive
added
the
S-waiting-on-review
This comment has been minimized.
This comment has been minimized.
compiler-errors
force-pushed
the
elided-lifetime-spans
branch
from
d102081 to
50ac7e9
Compare
BGR360
reviewed
Dec 28, 2021
Comment on lines
280
to
281
| // HACK: we use find_ancestor_inside to associate to properly suggest elided spans | ||
| // in paths originating from macros. |
There was a problem hiding this comment.
nit: grammar
also, what do macros have to do with this?
There was a problem hiding this comment.
so macros have nothing to #92324. But src/test/ui/in-band-lifetimes/elided-lifetimes.rs regresses if we don't return a subspan of the path_span.
There was a problem hiding this comment.
That's presumably why segment.ident.span was changed to path_span in #90446, but we still need a span that points to just the segment, not the whole path.
So this finds the segment's span inside of any macro if path_span inside of one.
compiler-errors
force-pushed
the
elided-lifetime-spans
branch
from
50ac7e9 to
e37d012
Compare
|
Thanks @compiler-errors! |
|
📌 Commit e37d012 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 28, 2021
…askrgr Rollup of 7 pull requests Successful merges: - rust-lang#92076 (Ignore other `PredicateKind`s in rustdoc auto trait finder) - rust-lang#92219 (Remove VCVARS_BAT) - rust-lang#92238 (Add a test suite for stringify macro) - rust-lang#92330 (Add myself to .mailmap) - rust-lang#92333 (Tighten span when suggesting lifetime on path) - rust-lang#92335 (Document units for `std::column`) - rust-lang#92344 (:arrow_up: rust-analyzer) 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.
This is kind of a hack.
Really the issue here is that we want to suggest the segment's span if the path resolves to something defined outside of the macro, and the macro's span if it resolves to something defined within.. I'll look into seeing if we can do something like that.
Fixes #92324
r? @cjgillot