about summary refs log tree commit diff
path: root/src/libsyntax/parse
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2016-05-02 21:37:18 -0700
committerbors <bors@rust-lang.org>2016-05-02 21:37:18 -0700
commit43c5fef47dcaebea4c77771cc6f187b2a72b3639 (patch)
tree4d740e1808a7d721e17781274bd8b07632b6b433 /src/libsyntax/parse
parent44b3cd8c462a420ab64a44ef8f70c007001a1f44 (diff)
parent638cf9f675174316ba5ecfaf2913c9d60da9772c (diff)
downloadrust-43c5fef47dcaebea4c77771cc6f187b2a72b3639.tar.gz
rust-43c5fef47dcaebea4c77771cc6f187b2a72b3639.zip
Auto merge of #33354 - Manishearth:rollup, r=Manishearth
Rollup of 14 pull requests

- Successful merges: #32756, #33129, #33225, #33260, #33309, #33320, #33323, #33324, #33325, #33330, #33332, #33334, #33335, #33346
- Failed merges:
Diffstat (limited to 'src/libsyntax/parse')
-rw-r--r--src/libsyntax/parse/lexer/mod.rs9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/libsyntax/parse/lexer/mod.rs b/src/libsyntax/parse/lexer/mod.rs
index 881663a056c..da62e5286d4 100644
--- a/src/libsyntax/parse/lexer/mod.rs
+++ b/src/libsyntax/parse/lexer/mod.rs
@@ -931,11 +931,10 @@ impl<'a> StringReader<'a> {
             _ => {
                 if ascii_only && first_source_char > '\x7F' {
                     let last_pos = self.last_pos;
-                    self.err_span_char(start,
-                                       last_pos,
-                                       "byte constant must be ASCII. Use a \\xHH escape for a \
-                                        non-ASCII byte",
-                                       first_source_char);
+                    self.err_span_(start,
+                                   last_pos,
+                                   "byte constant must be ASCII. Use a \\xHH escape for a \
+                                    non-ASCII byte");
                     return false;
                 }
             }