---

yaml
---
r: 152615
b: refs/heads/try2
c: 8de2618
h: refs/heads/master
i:
  152613: c6a99cd
  152611: 602a94a
  152607: d404430
v: v3

Author: SimonSapin

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 612bbaf7a07fe247e5e2d057cc4f10742918ead0
+refs/heads/try2: 8de2618182f14bb2245e8e89f171aaf9b2f29690
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/libsyntax/parse/lexer/mod.rs

@@ -906,8 +906,9 @@ impl<'a> StringReader<'a> {
                     // Byte offsetting here is okay because the
                     // character before position `start` are an
                     // ascii single quote and ascii 'b'.
+                    let last_pos = self_.last_pos;
                     self_.fatal_span_verbose(
-                        start - BytePos(2), self_.last_pos,
+                        start - BytePos(2), last_pos,
                         "unterminated byte constant".to_string());
                 }
                 self_.bump(); // advance curr past token
@@ -920,7 +921,8 @@ impl<'a> StringReader<'a> {
                 let mut value = Vec::new();
                 while !self_.curr_is('"') {
                     if self_.is_eof() {
-                        self_.fatal_span(start, self_.last_pos,
+                        let last_pos = self_.last_pos;
+                        self_.fatal_span(start, last_pos,
                                          "unterminated double quote byte string");
                     }
 
@@ -944,20 +946,25 @@ impl<'a> StringReader<'a> {
                 }
 
                 if self_.is_eof() {
-                    self_.fatal_span(start_bpos, self_.last_pos, "unterminated raw string");
+                    let last_pos = self_.last_pos;
+                    self_.fatal_span(start_bpos, last_pos, "unterminated raw string");
                 } else if !self_.curr_is('"') {
-                    self_.fatal_span_char(start_bpos, self_.last_pos,
+                    let last_pos = self_.last_pos;
+                    let ch = self_.curr.unwrap();
+                    self_.fatal_span_char(start_bpos, last_pos,
                                     "only `#` is allowed in raw string delimitation; \
                                      found illegal character",
-                                    self_.curr.unwrap());
+                                    ch);
                 }
                 self_.bump();
                 let content_start_bpos = self_.last_pos;
                 let mut content_end_bpos;
                 'outer: loop {
                     match self_.curr {
-                        None => self_.fatal_span(start_bpos, self_.last_pos,
-                                                 "unterminated raw string"),
+                        None => {
+                            let last_pos = self_.last_pos;
+                            self_.fatal_span(start_bpos, last_pos, "unterminated raw string")
+                        },
                         Some('"') => {
                             content_end_bpos = self_.last_pos;
                             for _ in range(0, hash_count) {
@@ -969,8 +976,9 @@ impl<'a> StringReader<'a> {
                             break;
                         },
                         Some(c) => if c > '\x7F' {
-                            self_.err_span_char(self_.last_pos, self_.last_pos,
-                                                "raw byte string must be ASCII", c);
+                            let last_pos = self_.last_pos;
+                            self_.err_span_char(
+                                last_pos, last_pos, "raw byte string must be ASCII", c);
                         }
                     }
                     self_.bump();