rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Rollup merge of #31281 - oli-obk:patch-2, r=nikomatsakis

Browse Source
This commit is contained in:
Steve Klabnik
2016-02-02 00:32:18 -05:00
parent 674f71edd0 54927ac57f
commit a9fbb05535
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libsyntax/errors/emitter.rs
View File

@@ -516,7 +516,7 @@ impl EmitterWriter {
}; };
let lo = self.cm.lookup_char_pos(sp.lo); let lo = self.cm.lookup_char_pos(sp.lo);
let hi = self.cm.lookup_char_pos(sp.hi); 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; let line_num = line.line_index + 1;
if !(lo.line <= line_num && hi.line >= line_num) { if !(lo.line <= line_num && hi.line >= line_num) {
@@ -1024,7 +1024,7 @@ mod test {
\x20 ^ ^\n"; \x20 ^ ^\n";
let expect0_end = "dummy.txt: 5 ccccc\n\ let expect0_end = "dummy.txt: 5 ccccc\n\
\x20 ...\n\ dummy.txt: 6 xxxxx\n\
dummy.txt: 7 yyyyy\n\ dummy.txt: 7 yyyyy\n\
\x20 ^\n\ \x20 ^\n\
\x20 ...\n\ \x20 ...\n\