Skip to content

Do not emit incorrect borrow suggestion involving macros and fix overlapping multiline spans #59473

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Mar 29, 2019
Merged

Do not emit incorrect borrow suggestion involving macros and fix overlapping multiline spans #59473

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0acb786
Do not suggest borrowing when the span comes from a macro
estebank Mar 28, 2019
925ca49
Add test
estebank Mar 28, 2019
326ec80
Account for fully overlapping multiline annotations
estebank Mar 28, 2019
e13e9a5
review comments
estebank Mar 29, 2019
8fad69c
Add comemnts clarifying logic
estebank Mar 29, 2019
b5690c2
Fix MultilineAnnotation field name
estebank Mar 29, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
review comments
  • Loading branch information
@estebank
estebank committed Mar 29, 2019
commit e13e9a5d636116455aab6940d27bbc1b450aa003
6 changes: 3 additions & 3 deletions src/librustc_errors/emitter.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ impl EmitterWriter {
end_col: hi.col_display,
is_primary: span_label.is_primary,
label: span_label.label.clone(),
overlaps: false,
overlaps_exactly: false,
};
multiline_annotations.push((lo.file.clone(), ml.clone()));
AnnotationType::Multiline(ml)
Expand Down Expand Up @@ -277,7 +277,7 @@ impl EmitterWriter {
{
a.increase_depth();
} else if ann.same_span(a) && &ann != a {
a.overlaps = true;
a.overlaps_exactly = true;
} else {
break;
}
Expand All @@ -290,7 +290,7 @@ impl EmitterWriter {
max_depth = ann.depth;
}
let mut end_ann = ann.as_end();
if !ann.overlaps {
if !ann.overlaps_exactly {
// avoid output like
//
// | foo(
Expand Down