From 3d43543c2104d6592e2a0e879d75cf27208be0c5 Mon Sep 17 00:00:00 2001 From: Jan Niklas Hasse Date: Sat, 28 Dec 2013 23:23:44 +0100 Subject: [PATCH 1/2] Output columns 1-based. Fixes #10848 --- src/libsyntax/codemap.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libsyntax/codemap.rs b/src/libsyntax/codemap.rs index 97d3db074bb00..fffcae0bde381 100644 --- a/src/libsyntax/codemap.rs +++ b/src/libsyntax/codemap.rs @@ -308,7 +308,7 @@ impl CodeMap { pub fn mk_substr_filename(&self, sp: Span) -> ~str { let pos = self.lookup_char_pos(sp.lo); return format!("<{}:{}:{}>", pos.file.name, - pos.line, pos.col.to_uint()); + pos.line, pos.col.to_uint() + 1) } /// Lookup source information about a BytePos @@ -354,7 +354,7 @@ impl CodeMap { let lo = self.lookup_char_pos_adj(sp.lo); let hi = self.lookup_char_pos_adj(sp.hi); return format!("{}:{}:{}: {}:{}", lo.filename, - lo.line, lo.col.to_uint(), hi.line, hi.col.to_uint()) + lo.line, lo.col.to_uint() + 1, hi.line, hi.col.to_uint() + 1) } pub fn span_to_filename(&self, sp: Span) -> FileName { From 86835c95f4c6f4753f139b096f9949a742c0ab51 Mon Sep 17 00:00:00 2001 From: Jan Niklas Hasse Date: Thu, 2 Jan 2014 02:19:59 +0100 Subject: [PATCH 2/2] Test column offset for #11184 --- src/test/compile-fail/column-offset-1-based.rs | 1 + 1 file changed, 1 insertion(+) create mode 100644 src/test/compile-fail/column-offset-1-based.rs diff --git a/src/test/compile-fail/column-offset-1-based.rs b/src/test/compile-fail/column-offset-1-based.rs new file mode 100644 index 0000000000000..8c100fd9718ff --- /dev/null +++ b/src/test/compile-fail/column-offset-1-based.rs @@ -0,0 +1 @@ +# //~ ERROR 1:1: 1:2 error: expected item