Skip to content

fix overflow due to multiline error span #31281

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 4 commits into from
Feb 2, 2016
Merged

fix overflow due to multiline error span #31281

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b5845c6
fix overflow due to multiline error span
oli-obk Jan 29, 2016
fe10914
Update emitter.rs
mitaa Jan 29, 2016
c511d36
Merge pull request #1 from mitaa/patch-1
oli-obk Jan 29, 2016
54927ac
off by one
oli-obk Jan 30, 2016
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
4 changes: 2 additions & 2 deletions src/libsyntax/errors/emitter.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -518,7 +518,7 @@ impl EmitterWriter {
};
let lo = self.cm.lookup_char_pos(sp.lo);
let hi = self.cm.lookup_char_pos(sp.hi);
let elide_sp = (lo.line - hi.line) > MAX_SP_LINES;
let elide_sp = (hi.line - lo.line) >= MAX_SP_LINES;

let line_num = line.line_index + 1;
if !(lo.line <= line_num && hi.line >= line_num) {
Expand Down Expand Up @@ -1026,7 +1026,7 @@ mod test {
\x20 ^ ^\n";

let expect0_end = "dummy.txt: 5 ccccc\n\
\x20 ...\n\
dummy.txt: 6 xxxxx\n\
dummy.txt: 7 yyyyy\n\
\x20 ^\n\
\x20 ...\n\
Expand Down