Fix ICE on format string of macro with secondary-label #91575
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
|
r? @cjgillot (rust-highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
hkmatsumoto
reviewed
Dec 6, 2021
Comment on lines
999
to
1000
| let sp2 = if efmt_kind_is_lit { fmt_span.from_inner(span) } else { fmt_span }; | ||
| e.span_label(sp2, label); |
There was a problem hiding this comment.
sp2 looks like a leftover temporary change. If so:
Suggested change
| let sp2 = if efmt_kind_is_lit { fmt_span.from_inner(span) } else { fmt_span }; | |
| e.span_label(sp2, label); | |
| let sp = if efmt_kind_is_lit { fmt_span.from_inner(span) } else { fmt_span }; | |
| e.span_label(sp, label); |
apiraino
added
the
T-compiler
cjgillot
reviewed
Dec 9, 2021
| @@ -995,8 +995,9 @@ pub fn expand_preparsed_format_args( | |||
| e.note(¬e); | |||
| } | |||
| if let Some((label, span)) = err.secondary_label { | |||
| let sp = fmt_span.from_inner(span); | |||
| e.span_label(sp, label); | |||
| // FIXME(compiler-errors): Should we just suppress this secondary_label? | |||
There was a problem hiding this comment.
I agree we should just suppress the secondary label. Its purpose is to point to the opening brace, which can't happen if we have to replace the span with fmt_span.
cjgillot
added
S-waiting-on-author
compiler-errors
force-pushed
the
issue-91556
branch
from
42975b8
to
99bd24e
Compare
|
r? @cjgillot |
|
@bors r+ rollup |
|
📌 Commit 99bd24e has been approved by |
bors
added
S-waiting-on-bors
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Dec 9, 2021
…llot Fix ICE on format string of macro with secondary-label This generalizes the fix rust-lang#86104 to also correctly skip `Span::from_inner` for the `secondary_label` of a format macro parsing error as well. We can alternatively skip the `span_label` diagnostic call for the secondary label as well, since that label probably only makes sense when the _proper_ span is computed. Fixes rust-lang#91556
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Dec 10, 2021
…llot Fix ICE on format string of macro with secondary-label This generalizes the fix rust-lang#86104 to also correctly skip `Span::from_inner` for the `secondary_label` of a format macro parsing error as well. We can alternatively skip the `span_label` diagnostic call for the secondary label as well, since that label probably only makes sense when the _proper_ span is computed. Fixes rust-lang#91556
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Dec 10, 2021
…llot Fix ICE on format string of macro with secondary-label This generalizes the fix rust-lang#86104 to also correctly skip `Span::from_inner` for the `secondary_label` of a format macro parsing error as well. We can alternatively skip the `span_label` diagnostic call for the secondary label as well, since that label probably only makes sense when the _proper_ span is computed. Fixes rust-lang#91556
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Dec 10, 2021
…askrgr Rollup of 10 pull requests Successful merges: - rust-lang#90407 (Document all public items in `rustc_incremental`) - rust-lang#90897 (Fix incorrect stability attributes) - rust-lang#91105 (Fix method name reference in stream documentation) - rust-lang#91325 (adjust const_eval_select documentation) - rust-lang#91470 (code-cov: generate dead functions with private/default linkage) - rust-lang#91482 (Update documentation to use `from()` to initialize `HashMap`s and `BTreeMap`s) - rust-lang#91524 (Fix Vec::extend_from_slice docs) - rust-lang#91575 (Fix ICE on format string of macro with secondary-label) - rust-lang#91625 (Remove redundant [..]s) - rust-lang#91646 (Fix documentation for `core::ready::Ready`) 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 generalizes the fix #86104 to also correctly skip
Span::from_innerfor thesecondary_labelof a format macro parsing error as well.We can alternatively skip the
span_labeldiagnostic call for the secondary label as well, since that label probably only makes sense when the proper span is computed.Fixes #91556