mathieu/granite-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Rollup merge of #90927 - terrarier2111:fix-float-ice, r=jackh726

Browse source 
Fix float ICE

This fixes https://github.com/rust-lang/rust/issues/90728
This commit is contained in:
Matthias Krüger 2021-11-20 22:33:49 +01:00 • committed by GitHub
commit 410d64fe9e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 29 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
compiler/rustc_parse/src/parser/expr.rs
View file

@ -1032,6 +1032,8 @@ impl<'a> Parser<'a> {
[IdentLike(_), Punct('+' | '-')] |
// 1e+2 | 1e-2
[IdentLike(_), Punct('+' | '-'), IdentLike(_)] |
// 1.2e+ | 1.2e-
[IdentLike(_), Punct('.'), IdentLike(_), Punct('+' | '-')] |
// 1.2e+3 | 1.2e-3
[IdentLike(_), Punct('.'), IdentLike(_), Punct('+' | '-'), IdentLike(_)] => {
// See the FIXME about `TokenCursor` above.

6
src/test/ui/parser/issue-90728.rs Normal file
View file

@ -0,0 +1,6 @@
fn main() {
a.5.2E+
//~^ ERROR: unexpected token: `5.2E+`
//~| ERROR: expected one of `.`, `;`, `?`, `}`, or an operator, found `5.2E+`
//~| ERROR: expected at least one digit in exponent
}

20
src/test/ui/parser/issue-90728.stderr Normal file
View file

@ -0,0 +1,20 @@
error: expected at least one digit in exponent
--> $DIR/issue-90728.rs:2:7
|
LL | a.5.2E+
| ^^^^^
error: unexpected token: `5.2E+`
--> $DIR/issue-90728.rs:2:7
|
LL | a.5.2E+
| ^^^^^
error: expected one of `.`, `;`, `?`, `}`, or an operator, found `5.2E+`
--> $DIR/issue-90728.rs:2:7
|
LL | a.5.2E+
| ^^^^^ expected one of `.`, `;`, `?`, `}`, or an operator
error: aborting due to 3 previous errors

2
src/tools/tidy/src/ui_tests.rs
View file

@ -9,7 +9,7 @@ const ENTRY_LIMIT: usize = 1000;
// FIXME: The following limits should be reduced eventually.
const ROOT_ENTRY_LIMIT: usize = 983;
const ISSUES_ENTRY_LIMIT: usize = 2310;
const PARSER_LIMIT: usize = 1010;
const PARSER_LIMIT: usize = 1012;
fn check_entries(path: &Path, bad: &mut bool) {
let dirs = walkdir::WalkDir::new(&path.join("test/ui"))