about summary refs log tree commit diff
path: root/src/libsyntax/parse
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2017-05-14 03:00:34 +0000
committerbors <bors@rust-lang.org>2017-05-14 03:00:34 +0000
commit94497b73a70c7062be0ad81d843c6aa88da0c71b (patch)
treece38906444c4c3b8bc5efa1b7c2cec335aeb8444 /src/libsyntax/parse
parent93dd1cab5d1ea0ceb178db424d4c907a20584b16 (diff)
parent7294ce10b64b192e70153ca9d0a9276dcaf4832c (diff)
downloadrust-94497b73a70c7062be0ad81d843c6aa88da0c71b.tar.gz
rust-94497b73a70c7062be0ad81d843c6aa88da0c71b.zip
Auto merge of #41987 - Mark-Simulacrum:rollup, r=Mark-Simulacrum
Rollup of 7 pull requests

- Successful merges: #41612, #41826, #41939, #41946, #41950, #41975, #41979
- Failed merges:
Diffstat (limited to 'src/libsyntax/parse')
-rw-r--r--src/libsyntax/parse/lexer/mod.rs4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/libsyntax/parse/lexer/mod.rs b/src/libsyntax/parse/lexer/mod.rs
index ded1f0b599a..a83b19c7334 100644
--- a/src/libsyntax/parse/lexer/mod.rs
+++ b/src/libsyntax/parse/lexer/mod.rs
@@ -754,9 +754,7 @@ impl<'a> StringReader<'a> {
         // integer literal followed by field/method access or a range pattern
         // (`0..2` and `12.foo()`)
         if self.ch_is('.') && !self.nextch_is('.') &&
-           !self.nextch()
-                .unwrap_or('\0')
-                .is_xid_start() {
+           !ident_start(self.nextch()) {
             // might have stuff after the ., and if it does, it needs to start
             // with a number
             self.bump();