Skip to content

Commit a8dbd71

Browse files
committed
Auto merge of #26512 - yongqli:master, r=sfackler
2 parents 5c5753e + f21682b commit a8dbd71

File tree

1 file changed

+13
-13
lines changed
  • src/libsyntax/parse/lexer

1 file changed

+13
-13
lines changed

src/libsyntax/parse/lexer/mod.rs

+13-13
Original file line numberDiff line numberDiff line change
@@ -729,18 +729,18 @@ impl<'a> StringReader<'a> {
729729
'n' | 'r' | 't' | '\\' | '\'' | '"' | '0' => true,
730730
'x' => self.scan_byte_escape(delim, !ascii_only),
731731
'u' if self.curr_is('{') => {
732-
let valid = self.scan_unicode_escape(delim);
733-
if valid && ascii_only {
734-
self.err_span_(
735-
escaped_pos,
736-
self.last_pos,
737-
"unicode escape sequences cannot be used as a byte or in \
738-
a byte string"
739-
);
740-
false
741-
} else {
742-
valid
743-
}
732+
let valid = self.scan_unicode_escape(delim);
733+
if valid && ascii_only {
734+
self.err_span_(
735+
escaped_pos,
736+
self.last_pos,
737+
"unicode escape sequences cannot be used as a byte or in \
738+
a byte string"
739+
);
740+
false
741+
} else {
742+
valid
743+
}
744744
}
745745
'\n' if delim == '"' => {
746746
self.consume_whitespace();
@@ -852,7 +852,7 @@ impl<'a> StringReader<'a> {
852852

853853
if valid && (char::from_u32(accum_int).is_none() || count == 0) {
854854
self.err_span_(start_bpos, self.last_pos, "illegal unicode character escape");
855-
valid= false;
855+
valid = false;
856856
}
857857

858858

0 commit comments

Comments
 (0)