mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use LitKind::Err for floats with unsupported bases.

Browse Source 
This slightly changes error messages in `float-field.rs`, but nothing of
real importance.
This commit is contained in:
Nicholas Nethercote 2024-02-28 16:30:20 +11:00
parent 79766098a4
commit 840c8d3243
3 changed files with 77 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
compiler/rustc_parse/src/lexer/mod.rs
View File

@ -515,7 +515,9 @@ impl<'sess, 'src> StringReader<'sess, 'src> {
}; };
if let Some(base) = base { if let Some(base) = base {
let span = self.mk_sp(start, end); let span = self.mk_sp(start, end);
self.dcx().emit_err(errors::FloatLiteralUnsupportedBase { span, base }); let guar =
self.dcx().emit_err(errors::FloatLiteralUnsupportedBase { span, base });
kind = token::Err(guar)
} }
(kind, self.symbol_from_to(start, end)) (kind, self.symbol_from_to(start, end))
} }

16
tests/ui/parser/float-field.rs
View File

@ -33,15 +33,17 @@ fn main() {
{ s.0x1e1; } //~ ERROR no field `0x1e1` on type `S` { s.0x1e1; } //~ ERROR no field `0x1e1` on type `S`
{ s.0x1.; } //~ ERROR no field `0x1` on type `S` { s.0x1.; } //~ ERROR hexadecimal float literal is not supported
//~| ERROR hexadecimal float literal is not supported //~| ERROR unexpected token: `0x1.`
//~| ERROR unexpected token: `;` //~| ERROR expected one of `.`, `;`, `?`, `}`, or an operator, found `0x1.`
{ s.0x1.1; } //~ ERROR no field `0x1` on type `S` { s.0x1.1; } //~ ERROR hexadecimal float literal is not supported
//~| ERROR hexadecimal float literal is not supported //~| ERROR unexpected token: `0x1.1`
//~| expected one of `.`, `;`, `?`, `}`, or an operator, found `0x1.1`
{ s.0x1.1e1; } //~ ERROR no field `0x1` on type `S` { s.0x1.1e1; } //~ ERROR hexadecimal float literal is not supported
//~| ERROR hexadecimal float literal is not supported //~| ERROR unexpected token: `0x1.1e1`
//~| expected one of `.`, `;`, `?`, `}`, or an operator, found `0x1.1e1`
{ s.0x1e+; } //~ ERROR expected expression, found `;` { s.0x1e+; } //~ ERROR expected expression, found `;`

124
tests/ui/parser/float-field.stderr
View File

@ -23,31 +23,31 @@ LL | { s.0x1.1; }
| ^^^^^ | ^^^^^
error: hexadecimal float literal is not supported error: hexadecimal float literal is not supported
--> $DIR/float-field.rs:43:9 --> $DIR/float-field.rs:44:9
| |
LL | { s.0x1.1e1; } LL | { s.0x1.1e1; }
| ^^^^^^^ | ^^^^^^^
error: hexadecimal float literal is not supported error: hexadecimal float literal is not supported
--> $DIR/float-field.rs:54:9 --> $DIR/float-field.rs:56:9
| |
LL | { s.0x1.1e+1; } LL | { s.0x1.1e+1; }
| ^^^^^^^^ | ^^^^^^^^
error: hexadecimal float literal is not supported error: hexadecimal float literal is not supported
--> $DIR/float-field.rs:58:9 --> $DIR/float-field.rs:60:9
| |
LL | { s.0x1.1e-1; } LL | { s.0x1.1e-1; }
| ^^^^^^^^ | ^^^^^^^^
error: expected at least one digit in exponent error: expected at least one digit in exponent
--> $DIR/float-field.rs:72:9 --> $DIR/float-field.rs:74:9
| |
LL | { s.1e+f32; } LL | { s.1e+f32; }
| ^^^^^^ | ^^^^^^
error: expected at least one digit in exponent error: expected at least one digit in exponent
--> $DIR/float-field.rs:76:9 --> $DIR/float-field.rs:78:9
| |
LL | { s.1e-f32; } LL | { s.1e-f32; }
| ^^^^^^ | ^^^^^^
@ -130,134 +130,164 @@ error: expected one of `.`, `;`, `?`, `}`, or an operator, found `1.1e-1`
LL | { s.1.1e-1; } LL | { s.1.1e-1; }
| ^^^^^^ expected one of `.`, `;`, `?`, `}`, or an operator | ^^^^^^ expected one of `.`, `;`, `?`, `}`, or an operator
error: unexpected token: `;` error: unexpected token: `0x1.`
--> $DIR/float-field.rs:36:13 --> $DIR/float-field.rs:36:9
| |
LL | { s.0x1.; } LL | { s.0x1.; }
| ^ | ^^^^
error: expected one of `.`, `;`, `?`, `}`, or an operator, found `0x1.`
--> $DIR/float-field.rs:36:9
|
LL | { s.0x1.; }
| ^^^^ expected one of `.`, `;`, `?`, `}`, or an operator
error: unexpected token: `0x1.1`
--> $DIR/float-field.rs:40:9
|
LL | { s.0x1.1; }
| ^^^^^
error: expected one of `.`, `;`, `?`, `}`, or an operator, found `0x1.1`
--> $DIR/float-field.rs:40:9
|
LL | { s.0x1.1; }
| ^^^^^ expected one of `.`, `;`, `?`, `}`, or an operator
error: unexpected token: `0x1.1e1`
--> $DIR/float-field.rs:44:9
|
LL | { s.0x1.1e1; }
| ^^^^^^^
error: expected one of `.`, `;`, `?`, `}`, or an operator, found `0x1.1e1`
--> $DIR/float-field.rs:44:9
|
LL | { s.0x1.1e1; }
| ^^^^^^^ expected one of `.`, `;`, `?`, `}`, or an operator
error: expected expression, found `;` error: expected expression, found `;`
--> $DIR/float-field.rs:46:14 --> $DIR/float-field.rs:48:14
| |
LL | { s.0x1e+; } LL | { s.0x1e+; }
| ^ expected expression | ^ expected expression
error: expected expression, found `;` error: expected expression, found `;`
--> $DIR/float-field.rs:48:14 --> $DIR/float-field.rs:50:14
| |
LL | { s.0x1e-; } LL | { s.0x1e-; }
| ^ expected expression | ^ expected expression
error: unexpected token: `0x1.1e+1` error: unexpected token: `0x1.1e+1`
--> $DIR/float-field.rs:54:9 --> $DIR/float-field.rs:56:9
| |
LL | { s.0x1.1e+1; } LL | { s.0x1.1e+1; }
| ^^^^^^^^ | ^^^^^^^^
error: expected one of `.`, `;`, `?`, `}`, or an operator, found `0x1.1e+1` error: expected one of `.`, `;`, `?`, `}`, or an operator, found `0x1.1e+1`
--> $DIR/float-field.rs:54:9 --> $DIR/float-field.rs:56:9
| |
LL | { s.0x1.1e+1; } LL | { s.0x1.1e+1; }
| ^^^^^^^^ expected one of `.`, `;`, `?`, `}`, or an operator | ^^^^^^^^ expected one of `.`, `;`, `?`, `}`, or an operator
error: unexpected token: `0x1.1e-1` error: unexpected token: `0x1.1e-1`
--> $DIR/float-field.rs:58:9 --> $DIR/float-field.rs:60:9
| |
LL | { s.0x1.1e-1; } LL | { s.0x1.1e-1; }
| ^^^^^^^^ | ^^^^^^^^
error: expected one of `.`, `;`, `?`, `}`, or an operator, found `0x1.1e-1` error: expected one of `.`, `;`, `?`, `}`, or an operator, found `0x1.1e-1`
--> $DIR/float-field.rs:58:9 --> $DIR/float-field.rs:60:9
| |
LL | { s.0x1.1e-1; } LL | { s.0x1.1e-1; }
| ^^^^^^^^ expected one of `.`, `;`, `?`, `}`, or an operator | ^^^^^^^^ expected one of `.`, `;`, `?`, `}`, or an operator
error: suffixes on a tuple index are invalid error: suffixes on a tuple index are invalid
--> $DIR/float-field.rs:62:9 --> $DIR/float-field.rs:64:9
| |
LL | { s.1e1f32; } LL | { s.1e1f32; }
| ^^^^^^ invalid suffix `f32` | ^^^^^^ invalid suffix `f32`
error: suffixes on a tuple index are invalid error: suffixes on a tuple index are invalid
--> $DIR/float-field.rs:67:9 --> $DIR/float-field.rs:69:9
| |
LL | { s.1.1f32; } LL | { s.1.1f32; }
| ^^^^^^ invalid suffix `f32` | ^^^^^^ invalid suffix `f32`
error: suffixes on a tuple index are invalid error: suffixes on a tuple index are invalid
--> $DIR/float-field.rs:69:9 --> $DIR/float-field.rs:71:9
| |
LL | { s.1.1e1f32; } LL | { s.1.1e1f32; }
| ^^^^^^^^ invalid suffix `f32` | ^^^^^^^^ invalid suffix `f32`
error: unexpected token: `1e+f32` error: unexpected token: `1e+f32`
--> $DIR/float-field.rs:72:9 --> $DIR/float-field.rs:74:9
| |
LL | { s.1e+f32; } LL | { s.1e+f32; }
| ^^^^^^ | ^^^^^^
error: expected one of `.`, `;`, `?`, `}`, or an operator, found `1e+f32` error: expected one of `.`, `;`, `?`, `}`, or an operator, found `1e+f32`
--> $DIR/float-field.rs:72:9 --> $DIR/float-field.rs:74:9
| |
LL | { s.1e+f32; } LL | { s.1e+f32; }
| ^^^^^^ expected one of `.`, `;`, `?`, `}`, or an operator | ^^^^^^ expected one of `.`, `;`, `?`, `}`, or an operator
error: unexpected token: `1e-f32` error: unexpected token: `1e-f32`
--> $DIR/float-field.rs:76:9 --> $DIR/float-field.rs:78:9
| |
LL | { s.1e-f32; } LL | { s.1e-f32; }
| ^^^^^^ | ^^^^^^
error: expected one of `.`, `;`, `?`, `}`, or an operator, found `1e-f32` error: expected one of `.`, `;`, `?`, `}`, or an operator, found `1e-f32`
--> $DIR/float-field.rs:76:9 --> $DIR/float-field.rs:78:9
| |
LL | { s.1e-f32; } LL | { s.1e-f32; }
| ^^^^^^ expected one of `.`, `;`, `?`, `}`, or an operator | ^^^^^^ expected one of `.`, `;`, `?`, `}`, or an operator
error: unexpected token: `1e+1f32` error: unexpected token: `1e+1f32`
--> $DIR/float-field.rs:80:9 --> $DIR/float-field.rs:82:9
| |
LL | { s.1e+1f32; } LL | { s.1e+1f32; }
| ^^^^^^^ | ^^^^^^^
error: expected one of `.`, `;`, `?`, `}`, or an operator, found `1e+1f32` error: expected one of `.`, `;`, `?`, `}`, or an operator, found `1e+1f32`
--> $DIR/float-field.rs:80:9 --> $DIR/float-field.rs:82:9
| |
LL | { s.1e+1f32; } LL | { s.1e+1f32; }
| ^^^^^^^ expected one of `.`, `;`, `?`, `}`, or an operator | ^^^^^^^ expected one of `.`, `;`, `?`, `}`, or an operator
error: unexpected token: `1e-1f32` error: unexpected token: `1e-1f32`
--> $DIR/float-field.rs:83:9 --> $DIR/float-field.rs:85:9
| |
LL | { s.1e-1f32; } LL | { s.1e-1f32; }
| ^^^^^^^ | ^^^^^^^
error: expected one of `.`, `;`, `?`, `}`, or an operator, found `1e-1f32` error: expected one of `.`, `;`, `?`, `}`, or an operator, found `1e-1f32`
--> $DIR/float-field.rs:83:9 --> $DIR/float-field.rs:85:9
| |
LL | { s.1e-1f32; } LL | { s.1e-1f32; }
| ^^^^^^^ expected one of `.`, `;`, `?`, `}`, or an operator | ^^^^^^^ expected one of `.`, `;`, `?`, `}`, or an operator
error: unexpected token: `1.1e+1f32` error: unexpected token: `1.1e+1f32`
--> $DIR/float-field.rs:86:9 --> $DIR/float-field.rs:88:9
| |
LL | { s.1.1e+1f32; } LL | { s.1.1e+1f32; }
| ^^^^^^^^^ | ^^^^^^^^^
error: expected one of `.`, `;`, `?`, `}`, or an operator, found `1.1e+1f32` error: expected one of `.`, `;`, `?`, `}`, or an operator, found `1.1e+1f32`
--> $DIR/float-field.rs:86:9 --> $DIR/float-field.rs:88:9
| |
LL | { s.1.1e+1f32; } LL | { s.1.1e+1f32; }
| ^^^^^^^^^ expected one of `.`, `;`, `?`, `}`, or an operator | ^^^^^^^^^ expected one of `.`, `;`, `?`, `}`, or an operator
error: unexpected token: `1.1e-1f32` error: unexpected token: `1.1e-1f32`
--> $DIR/float-field.rs:89:9 --> $DIR/float-field.rs:91:9
| |
LL | { s.1.1e-1f32; } LL | { s.1.1e-1f32; }
| ^^^^^^^^^ | ^^^^^^^^^
error: expected one of `.`, `;`, `?`, `}`, or an operator, found `1.1e-1f32` error: expected one of `.`, `;`, `?`, `}`, or an operator, found `1.1e-1f32`
--> $DIR/float-field.rs:89:9 --> $DIR/float-field.rs:91:9
| |
LL | { s.1.1e-1f32; } LL | { s.1.1e-1f32; }
| ^^^^^^^^^ expected one of `.`, `;`, `?`, `}`, or an operator | ^^^^^^^^^ expected one of `.`, `;`, `?`, `}`, or an operator
@ -284,32 +314,8 @@ LL | { s.0x1e1; }
| |
= note: available fields are: `0`, `1` = note: available fields are: `0`, `1`
error[E0609]: no field `0x1` on type `S`
--> $DIR/float-field.rs:36:9
|
LL | { s.0x1.; }
| ^^^ unknown field
|
= note: available fields are: `0`, `1`
error[E0609]: no field `0x1` on type `S`
--> $DIR/float-field.rs:40:9
|
LL | { s.0x1.1; }
| ^^^ unknown field
|
= note: available fields are: `0`, `1`
error[E0609]: no field `0x1` on type `S`
--> $DIR/float-field.rs:43:9
|
LL | { s.0x1.1e1; }
| ^^^ unknown field
|
= note: available fields are: `0`, `1`
error[E0609]: no field `0x1e` on type `S` error[E0609]: no field `0x1e` on type `S`
--> $DIR/float-field.rs:50:9 --> $DIR/float-field.rs:52:9
| |
LL | { s.0x1e+1; } LL | { s.0x1e+1; }
| ^^^^ unknown field | ^^^^ unknown field
@ -317,7 +323,7 @@ LL | { s.0x1e+1; }
= note: available fields are: `0`, `1` = note: available fields are: `0`, `1`
error[E0609]: no field `0x1e` on type `S` error[E0609]: no field `0x1e` on type `S`
--> $DIR/float-field.rs:52:9 --> $DIR/float-field.rs:54:9
| |
LL | { s.0x1e-1; } LL | { s.0x1e-1; }
| ^^^^ unknown field | ^^^^ unknown field
@ -325,7 +331,7 @@ LL | { s.0x1e-1; }
= note: available fields are: `0`, `1` = note: available fields are: `0`, `1`
error[E0609]: no field `1e1` on type `S` error[E0609]: no field `1e1` on type `S`
--> $DIR/float-field.rs:62:9 --> $DIR/float-field.rs:64:9
| |
LL | { s.1e1f32; } LL | { s.1e1f32; }
| ^^^^^^ unknown field | ^^^^^^ unknown field
@ -333,17 +339,17 @@ LL | { s.1e1f32; }
= note: available fields are: `0`, `1` = note: available fields are: `0`, `1`
error[E0609]: no field `f32` on type `(u8, u8)` error[E0609]: no field `f32` on type `(u8, u8)`
--> $DIR/float-field.rs:65:11 --> $DIR/float-field.rs:67:11
| |
LL | { s.1.f32; } LL | { s.1.f32; }
| ^^^ unknown field | ^^^ unknown field
error[E0609]: no field `1e1` on type `(u8, u8)` error[E0609]: no field `1e1` on type `(u8, u8)`
--> $DIR/float-field.rs:69:9 --> $DIR/float-field.rs:71:9
| |
LL | { s.1.1e1f32; } LL | { s.1.1e1f32; }
| ^^^^^^^^ unknown field | ^^^^^^^^ unknown field
error: aborting due to 55 previous errors error: aborting due to 57 previous errors
For more information about this error, try `rustc --explain E0609`. For more information about this error, try `rustc --explain E0609`.