about summary refs log tree commit diff
path: root/src/libsyntax/parse
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2017-03-19 17:44:02 +0000
committerbors <bors@rust-lang.org>2017-03-19 17:44:02 +0000
commit38c53f3c2d31e73404545114f0ef42d5711c6403 (patch)
tree54cee6512393829c234980aefb0c90260747278e /src/libsyntax/parse
parent9c15de4fd59bee290848b5443c7e194fd5afb02c (diff)
parent94e346b7b79d37fea729fa68fc2838e90724cc3f (diff)
downloadrust-38c53f3c2d31e73404545114f0ef42d5711c6403.tar.gz
rust-38c53f3c2d31e73404545114f0ef42d5711c6403.zip
Auto merge of #40651 - frewsxcv:rollup, r=frewsxcv
Rollup of 13 pull requests

- Successful merges: #40441, #40445, #40562, #40564, #40583, #40588, #40589, #40590, #40603, #40611, #40621, #40646, #40648
- Failed merges:
Diffstat (limited to 'src/libsyntax/parse')
-rw-r--r--src/libsyntax/parse/lexer/mod.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libsyntax/parse/lexer/mod.rs b/src/libsyntax/parse/lexer/mod.rs
index de8a87e3a2b..d48cf6911ed 100644
--- a/src/libsyntax/parse/lexer/mod.rs
+++ b/src/libsyntax/parse/lexer/mod.rs
@@ -725,7 +725,7 @@ impl<'a> StringReader<'a> {
                     base = 16;
                     num_digits = self.scan_digits(16, 16);
                 }
-                '0'...'9' | '_' | '.' => {
+                '0'...'9' | '_' | '.' | 'e' | 'E' => {
                     num_digits = self.scan_digits(10, 10) + 1;
                 }
                 _ => {