bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Auto merge of #26512 - yongqli:master, r=sfackler

Browse source
This commit is contained in:
bors 2015-06-22 22:33:51 +00:00
commit a8dbd71fc8
1 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/libsyntax/parse/lexer/mod.rs
View file

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