bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Write UI tests, tweak message

Browse source
This commit is contained in:
5225225 2022-01-27 22:22:33 +00:00
parent 7f24778102
commit ec3b711a4b
4 changed files with 254 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1738,11 +1738,10 @@ impl<'a> Parser<'a> {
.help("valid widths are 8, 16, 32, 64 and 128") .help("valid widths are 8, 16, 32, 64 and 128")
.emit(); .emit();
} else if let Some(fixed) = fix_base_capitalisation(suf) { } else if let Some(fixed) = fix_base_capitalisation(suf) {
let msg = format!("invalid suffix `{}` for number literal", suf); let msg = "invalid base prefix for number literal";
self.struct_span_err(span, &msg) self.struct_span_err(span, &msg)
.span_label(span, format!("invalid suffix `{}`", suf)) .note("base prefixes (`0xff`, `0b1010`, `0o755`) are lowercase")
.help("base prefixes (`0xff`, `0b1010`, `0o755`) are lowercase")
.span_suggestion( .span_suggestion(
span, span,
"try making the prefix lowercase", "try making the prefix lowercase",

77
src/test/ui/numeric/uppercase-base-prefix.fixed Normal file
View file

@ -0,0 +1,77 @@
// run-rustfix
// Checks that integers with an uppercase base prefix (0B, 0X, 0O) have a nice error
#![allow(unused_variables)]
fn main() {
let a = 0xABCDEF;
//~^ ERROR invalid base prefix for number literal
//~| NOTE base prefixes (`0xff`, `0b1010`, `0o755`) are lowercase
//~| HELP try making the prefix lowercase
//~| SUGGESTION 0xABCDEF
let b = 0o755;
//~^ ERROR invalid base prefix for number literal
//~| NOTE base prefixes (`0xff`, `0b1010`, `0o755`) are lowercase
//~| HELP try making the prefix lowercase
//~| SUGGESTION 0o755
let c = 0b10101010;
//~^ ERROR invalid base prefix for number literal
//~| NOTE base prefixes (`0xff`, `0b1010`, `0o755`) are lowercase
//~| HELP try making the prefix lowercase
//~| SUGGESTION 0b10101010
let d = 0xABC_DEF;
//~^ ERROR invalid base prefix for number literal
//~| NOTE base prefixes (`0xff`, `0b1010`, `0o755`) are lowercase
//~| HELP try making the prefix lowercase
//~| SUGGESTION 0xABC_DEF
let e = 0o7_55;
//~^ ERROR invalid base prefix for number literal
//~| NOTE base prefixes (`0xff`, `0b1010`, `0o755`) are lowercase
//~| HELP try making the prefix lowercase
//~| SUGGESTION 0o7_55
let f = 0b1010_1010;
//~^ ERROR invalid base prefix for number literal
//~| NOTE base prefixes (`0xff`, `0b1010`, `0o755`) are lowercase
//~| HELP try making the prefix lowercase
//~| SUGGESTION 0b1010_1010
let g = 0xABC_DEF_u64;
//~^ ERROR invalid base prefix for number literal
//~| NOTE base prefixes (`0xff`, `0b1010`, `0o755`) are lowercase
//~| HELP try making the prefix lowercase
//~| SUGGESTION 0xABC_DEF_u64
let h = 0o7_55_u32;
//~^ ERROR invalid base prefix for number literal
//~| NOTE base prefixes (`0xff`, `0b1010`, `0o755`) are lowercase
//~| HELP try making the prefix lowercase
//~| SUGGESTION 0o7_55_u32
let i = 0b1010_1010_u8;
//~^ ERROR invalid base prefix for number literal
//~| NOTE base prefixes (`0xff`, `0b1010`, `0o755`) are lowercase
//~| HELP try making the prefix lowercase
//~| SUGGESTION 0b1010_1010_u8
//
let j = 0xABCDEFu64;
//~^ ERROR invalid base prefix for number literal
//~| NOTE base prefixes (`0xff`, `0b1010`, `0o755`) are lowercase
//~| HELP try making the prefix lowercase
//~| SUGGESTION 0xABCDEFu64
let k = 0o755u32;
//~^ ERROR invalid base prefix for number literal
//~| NOTE base prefixes (`0xff`, `0b1010`, `0o755`) are lowercase
//~| HELP try making the prefix lowercase
//~| SUGGESTION 0o755u32
let l = 0b10101010u8;
//~^ ERROR invalid base prefix for number literal
//~| NOTE base prefixes (`0xff`, `0b1010`, `0o755`) are lowercase
//~| HELP try making the prefix lowercase
//~| SUGGESTION 0b10101010u8
}

77
src/test/ui/numeric/uppercase-base-prefix.rs Normal file
View file

@ -0,0 +1,77 @@
// run-rustfix
// Checks that integers with an uppercase base prefix (0B, 0X, 0O) have a nice error
#![allow(unused_variables)]
fn main() {
let a = 0XABCDEF;
//~^ ERROR invalid base prefix for number literal
//~| NOTE base prefixes (`0xff`, `0b1010`, `0o755`) are lowercase
//~| HELP try making the prefix lowercase
//~| SUGGESTION 0xABCDEF
let b = 0O755;
//~^ ERROR invalid base prefix for number literal
//~| NOTE base prefixes (`0xff`, `0b1010`, `0o755`) are lowercase
//~| HELP try making the prefix lowercase
//~| SUGGESTION 0o755
let c = 0B10101010;
//~^ ERROR invalid base prefix for number literal
//~| NOTE base prefixes (`0xff`, `0b1010`, `0o755`) are lowercase
//~| HELP try making the prefix lowercase
//~| SUGGESTION 0b10101010
let d = 0XABC_DEF;
//~^ ERROR invalid base prefix for number literal
//~| NOTE base prefixes (`0xff`, `0b1010`, `0o755`) are lowercase
//~| HELP try making the prefix lowercase
//~| SUGGESTION 0xABC_DEF
let e = 0O7_55;
//~^ ERROR invalid base prefix for number literal
//~| NOTE base prefixes (`0xff`, `0b1010`, `0o755`) are lowercase
//~| HELP try making the prefix lowercase
//~| SUGGESTION 0o7_55
let f = 0B1010_1010;
//~^ ERROR invalid base prefix for number literal
//~| NOTE base prefixes (`0xff`, `0b1010`, `0o755`) are lowercase
//~| HELP try making the prefix lowercase
//~| SUGGESTION 0b1010_1010
let g = 0XABC_DEF_u64;
//~^ ERROR invalid base prefix for number literal
//~| NOTE base prefixes (`0xff`, `0b1010`, `0o755`) are lowercase
//~| HELP try making the prefix lowercase
//~| SUGGESTION 0xABC_DEF_u64
let h = 0O7_55_u32;
//~^ ERROR invalid base prefix for number literal
//~| NOTE base prefixes (`0xff`, `0b1010`, `0o755`) are lowercase
//~| HELP try making the prefix lowercase
//~| SUGGESTION 0o7_55_u32
let i = 0B1010_1010_u8;
//~^ ERROR invalid base prefix for number literal
//~| NOTE base prefixes (`0xff`, `0b1010`, `0o755`) are lowercase
//~| HELP try making the prefix lowercase
//~| SUGGESTION 0b1010_1010_u8
//
let j = 0XABCDEFu64;
//~^ ERROR invalid base prefix for number literal
//~| NOTE base prefixes (`0xff`, `0b1010`, `0o755`) are lowercase
//~| HELP try making the prefix lowercase
//~| SUGGESTION 0xABCDEFu64
let k = 0O755u32;
//~^ ERROR invalid base prefix for number literal
//~| NOTE base prefixes (`0xff`, `0b1010`, `0o755`) are lowercase
//~| HELP try making the prefix lowercase
//~| SUGGESTION 0o755u32
let l = 0B10101010u8;
//~^ ERROR invalid base prefix for number literal
//~| NOTE base prefixes (`0xff`, `0b1010`, `0o755`) are lowercase
//~| HELP try making the prefix lowercase
//~| SUGGESTION 0b10101010u8
}

98
src/test/ui/numeric/uppercase-base-prefix.stderr Normal file
View file

@ -0,0 +1,98 @@
error: invalid base prefix for number literal
--> $DIR/uppercase-base-prefix.rs:6:13
|
LL | let a = 0XABCDEF;
| ^^^^^^^^ help: try making the prefix lowercase (notice the capitalization): `0xABCDEF`
|
= note: base prefixes (`0xff`, `0b1010`, `0o755`) are lowercase
error: invalid base prefix for number literal
--> $DIR/uppercase-base-prefix.rs:12:13
|
LL | let b = 0O755;
| ^^^^^ help: try making the prefix lowercase (notice the capitalization): `0o755`
|
= note: base prefixes (`0xff`, `0b1010`, `0o755`) are lowercase
error: invalid base prefix for number literal
--> $DIR/uppercase-base-prefix.rs:18:13
|
LL | let c = 0B10101010;
| ^^^^^^^^^^ help: try making the prefix lowercase: `0b10101010`
|
= note: base prefixes (`0xff`, `0b1010`, `0o755`) are lowercase
error: invalid base prefix for number literal
--> $DIR/uppercase-base-prefix.rs:24:13
|
LL | let d = 0XABC_DEF;
| ^^^^^^^^^ help: try making the prefix lowercase (notice the capitalization): `0xABC_DEF`
|
= note: base prefixes (`0xff`, `0b1010`, `0o755`) are lowercase
error: invalid base prefix for number literal
--> $DIR/uppercase-base-prefix.rs:30:13
|
LL | let e = 0O7_55;
| ^^^^^^ help: try making the prefix lowercase (notice the capitalization): `0o7_55`
|
= note: base prefixes (`0xff`, `0b1010`, `0o755`) are lowercase
error: invalid base prefix for number literal
--> $DIR/uppercase-base-prefix.rs:36:13
|
LL | let f = 0B1010_1010;
| ^^^^^^^^^^^ help: try making the prefix lowercase: `0b1010_1010`
|
= note: base prefixes (`0xff`, `0b1010`, `0o755`) are lowercase
error: invalid base prefix for number literal
--> $DIR/uppercase-base-prefix.rs:42:13
|
LL | let g = 0XABC_DEF_u64;
| ^^^^^^^^^^^^^ help: try making the prefix lowercase (notice the capitalization): `0xABC_DEF_u64`
|
= note: base prefixes (`0xff`, `0b1010`, `0o755`) are lowercase
error: invalid base prefix for number literal
--> $DIR/uppercase-base-prefix.rs:48:13
|
LL | let h = 0O7_55_u32;
| ^^^^^^^^^^ help: try making the prefix lowercase (notice the capitalization): `0o7_55_u32`
|
= note: base prefixes (`0xff`, `0b1010`, `0o755`) are lowercase
error: invalid base prefix for number literal
--> $DIR/uppercase-base-prefix.rs:54:13
|
LL | let i = 0B1010_1010_u8;
| ^^^^^^^^^^^^^^ help: try making the prefix lowercase: `0b1010_1010_u8`
|
= note: base prefixes (`0xff`, `0b1010`, `0o755`) are lowercase
error: invalid base prefix for number literal
--> $DIR/uppercase-base-prefix.rs:60:13
|
LL | let j = 0XABCDEFu64;
| ^^^^^^^^^^^ help: try making the prefix lowercase (notice the capitalization): `0xABCDEFu64`
|
= note: base prefixes (`0xff`, `0b1010`, `0o755`) are lowercase
error: invalid base prefix for number literal
--> $DIR/uppercase-base-prefix.rs:66:13
|
LL | let k = 0O755u32;
| ^^^^^^^^ help: try making the prefix lowercase (notice the capitalization): `0o755u32`
|
= note: base prefixes (`0xff`, `0b1010`, `0o755`) are lowercase
error: invalid base prefix for number literal
--> $DIR/uppercase-base-prefix.rs:72:13
|
LL | let l = 0B10101010u8;
| ^^^^^^^^^^^^ help: try making the prefix lowercase: `0b10101010u8`
|
= note: base prefixes (`0xff`, `0b1010`, `0o755`) are lowercase
error: aborting due to 12 previous errors