---

yaml
---
r: 227747
b: refs/heads/try
c: cffaf0e
h: refs/heads/master
i:
  227745: 0695994
  227743: c425fac
v: v3

Author: bors

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: aca2057ed5fb7af3f8905b2bc01f72fa001c35c8
 refs/heads/snap-stage3: 1af31d4974e33027a68126fa5a5a3c2c6491824f
-refs/heads/try: a006a82724d1efec712f0f0d337aeeaf3f14258c
+refs/heads/try: cffaf0e7a82e7b95bf76f37ad074451409a995e9
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

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

@@ -729,18 +729,18 @@ impl<'a> StringReader<'a> {
                             'n' | 'r' | 't' | '\\' | '\'' | '"' | '0' => true,
                             'x' => self.scan_byte_escape(delim, !ascii_only),
                             'u' if self.curr_is('{') => {
-                            let valid = self.scan_unicode_escape(delim);
-                            if valid && ascii_only {
-                                self.err_span_(
-                                    escaped_pos,
-                                    self.last_pos,
-                                    "unicode escape sequences cannot be used as a byte or in \
-                                    a byte string"
-                                );
-                                false
-                            } else {
-                               valid
-                            }
+                                let valid = self.scan_unicode_escape(delim);
+                                if valid && ascii_only {
+                                    self.err_span_(
+                                        escaped_pos,
+                                        self.last_pos,
+                                        "unicode escape sequences cannot be used as a byte or in \
+                                        a byte string"
+                                    );
+                                    false
+                                } else {
+                                   valid
+                                }
                             }
                             '\n' if delim == '"' => {
                                 self.consume_whitespace();
@@ -852,7 +852,7 @@ impl<'a> StringReader<'a> {
 
         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;
+            valid = false;
         }