From 43cae880790b532e5b3e2fb99c64a4ec78030652 Mon Sep 17 00:00:00 2001
From: Björn Steinbrink <bsteinbr@gmail.com>
Date: Fri, 7 Jun 2013 20:00:37 +0200
Subject: Lexer: Fix offset handling in get_str_from()

As the comment said, the subtraction is bogus for multibyte characters.
Fortunately, we can just use last_pos instead of pos to get the correct
position without any subtraction hackery.
---
 src/libsyntax/parse/comments.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/libsyntax/parse/comments.rs')

diff --git a/src/libsyntax/parse/comments.rs b/src/libsyntax/parse/comments.rs
index dab8dd3b4b6..54fba29a19a 100644
--- a/src/libsyntax/parse/comments.rs
+++ b/src/libsyntax/parse/comments.rs
@@ -347,7 +347,7 @@ pub fn gather_comments_and_literals(span_diagnostic:
         }
 
 
-        let bstart = rdr.pos;
+        let bstart = rdr.last_pos;
         rdr.next_token();
         //discard, and look ahead; we're working with internal state
         let TokenAndSpan {tok: tok, sp: sp} = rdr.peek();
-- 
cgit 1.4.1-3-g733a5