---

yaml
---
r: 218591
b: refs/heads/auto
c: d22f189
h: refs/heads/master
i:
  218589: 38cd11e
  218587: 6cd391e
  218583: 8644ccd
  218575: dcb75cd
  218559: 854ec4c
v: v3

Author: nagisa

[refs]

@@ -8,7 +8,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: 0bd5dd6449c9db734bd2d1700ea4b50e22b220be
+refs/heads/auto: d22f189da13f8ffb3c9227a038615608e99a6211
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336
 refs/tags/0.2: 1754d02027f2924bed83b0160ee340c7f41d5ea1

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

@@ -742,7 +742,7 @@ impl<'a> StringReader<'a> {
                                 let valid = self.scan_unicode_escape(delim);
                                 if valid && ascii_only {
                                     self.err_span_(
-                                        escaped_pos,
+                                        start,
                                         self.last_pos,
                                         "unicode escape sequences cannot be used as a byte or in \
                                         a byte string"
@@ -753,9 +753,9 @@ impl<'a> StringReader<'a> {
                                 }
                             }
                             'u' if !ascii_only => {
-                                self.err_span_(escaped_pos, self.last_pos,
+                                self.err_span_(start, self.last_pos,
                                     "incomplete unicode escape sequence");
-                                self.help_span_(escaped_pos, self.last_pos,
+                                self.help_span_(start, self.last_pos,
                                     "format of unicode escape sequences is `\\u{…}`");
                                 false
                             }
@@ -862,14 +862,12 @@ impl<'a> StringReader<'a> {
             valid = false;
         }
 
-        self.bump(); // past the ending }
-
         if valid && (char::from_u32(accum_int).is_none() || count == 0) {
             self.err_span_(start_bpos, self.last_pos, "illegal unicode character escape");
             valid = false;
         }
 
-
+        self.bump(); // past the ending }
         valid
     }