Use the correct span for displaying the line following a derive sugge… #113871
Conversation
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
|
r? @eholk (rustbot has picked a reviewer for you, use r? to override) |
rustbot
added
S-waiting-on-review
compiler-errors
approved these changes
Jul 20, 2023
|
r? @compiler-errors @bors r+ rollup |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jul 20, 2023
…iaskrgr Rollup of 5 pull requests Successful merges: - rust-lang#113710 (Fix rpath for libdir is specified) - rust-lang#113787 (Update documentation for std::process::Command's new method) - rust-lang#113795 (Properly document `lifetime_mapping` in `OpaqueTy`) - rust-lang#113857 (Add tests for `--document-hidden-items` option) - rust-lang#113871 (Use the correct span for displaying the line following a derive sugge…) 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.
spanhere is the main span of the diagnostic. In the linked issue's case, this belongs tomain.rs. However, the line numbers (and line we are trying to display) are inname.rs, so usingspan_to_linesgives us the wrongFileLines.Use
parts[0].span(the span of the suggestion) here like the rest of the code does to get the right file.Not sure if this needs a dedicated test because this fixes an existing error in the UI suite
Fixes #113844