Auto merge of #68717 - petrochenkov:stabexpat, r=varkor

[rust.git] / tests / ui / literals.stderr

diff --git a/tests/ui/literals.stderr b/tests/ui/literals.stderr
index 6f6ea75df10ebf6380b53663174e2192171f0278..0b3af2d8bc35fea0b4a2fcace4f6cf7a1ad1e8d3 100644 (file)
--- a/tests/ui/literals.stderr
+++ b/tests/ui/literals.stderr
@@ -1,124 +1,73 @@
 error: inconsistent casing in hexadecimal literal
-  --> $DIR/literals.rs:12:17
+  --> $DIR/literals.rs:14:17
    |
-12 |     let fail1 = 0xabCD;
+LL |     let fail1 = 0xabCD;
    |                 ^^^^^^
    |
-   = note: `-D mixed-case-hex-literals` implied by `-D warnings`
+   = note: `-D clippy::mixed-case-hex-literals` implied by `-D warnings`
 
 error: inconsistent casing in hexadecimal literal
-  --> $DIR/literals.rs:13:17
+  --> $DIR/literals.rs:15:17
    |
-13 |     let fail2 = 0xabCD_u32;
+LL |     let fail2 = 0xabCD_u32;
    |                 ^^^^^^^^^^
 
 error: inconsistent casing in hexadecimal literal
-  --> $DIR/literals.rs:14:17
+  --> $DIR/literals.rs:16:17
    |
-14 |     let fail2 = 0xabCD_isize;
+LL |     let fail2 = 0xabCD_isize;
    |                 ^^^^^^^^^^^^
 
-error: integer type suffix should be separated by an underscore
-  --> $DIR/literals.rs:15:27
-   |
-15 |     let fail_multi_zero = 000_123usize;
-   |                           ^^^^^^^^^^^^
-   |
-   = note: `-D unseparated-literal-suffix` implied by `-D warnings`
-
 error: this is a decimal constant
-  --> $DIR/literals.rs:15:27
+  --> $DIR/literals.rs:17:27
    |
-15 |     let fail_multi_zero = 000_123usize;
+LL |     let fail_multi_zero = 000_123usize;
    |                           ^^^^^^^^^^^^
    |
-   = note: `-D zero-prefixed-literal` implied by `-D warnings`
-help: if you mean to use a decimal constant, remove the `0` to remove confusion
+   = note: `-D clippy::zero-prefixed-literal` implied by `-D warnings`
+help: if you mean to use a decimal constant, remove the `0` to avoid confusion
    |
-15 |     let fail_multi_zero = 123usize;
+LL |     let fail_multi_zero = 123usize;
    |                           ^^^^^^^^
 help: if you mean to use an octal constant, use `0o`
    |
-15 |     let fail_multi_zero = 0o123usize;
+LL |     let fail_multi_zero = 0o123usize;
    |                           ^^^^^^^^^^
 
-error: integer type suffix should be separated by an underscore
-  --> $DIR/literals.rs:20:17
-   |
-20 |     let fail3 = 1234i32;
-   |                 ^^^^^^^
-
-error: integer type suffix should be separated by an underscore
-  --> $DIR/literals.rs:21:17
-   |
-21 |     let fail4 = 1234u32;
-   |                 ^^^^^^^
-
-error: integer type suffix should be separated by an underscore
-  --> $DIR/literals.rs:22:17
-   |
-22 |     let fail5 = 1234isize;
-   |                 ^^^^^^^^^
-
-error: integer type suffix should be separated by an underscore
-  --> $DIR/literals.rs:23:17
-   |
-23 |     let fail6 = 1234usize;
-   |                 ^^^^^^^^^
-
-error: float type suffix should be separated by an underscore
-  --> $DIR/literals.rs:24:17
-   |
-24 |     let fail7 = 1.5f32;
-   |                 ^^^^^^
-
 error: this is a decimal constant
-  --> $DIR/literals.rs:28:17
+  --> $DIR/literals.rs:21:17
    |
-28 |     let fail8 = 0123;
+LL |     let fail8 = 0123;
    |                 ^^^^
-help: if you mean to use a decimal constant, remove the `0` to remove confusion
    |
-28 |     let fail8 = 123;
+help: if you mean to use a decimal constant, remove the `0` to avoid confusion
+   |
+LL |     let fail8 = 123;
    |                 ^^^
 help: if you mean to use an octal constant, use `0o`
    |
-28 |     let fail8 = 0o123;
+LL |     let fail8 = 0o123;
    |                 ^^^^^
 
-error: long literal lacking separators
-  --> $DIR/literals.rs:39:17
-   |
-39 |     let fail9 = 0xabcdef;
-   |                 ^^^^^^^^ help: consider: `0x00ab_cdef`
-   |
-   = note: `-D unreadable-literal` implied by `-D warnings`
-
-error: long literal lacking separators
-  --> $DIR/literals.rs:40:18
+error: digits grouped inconsistently by underscores
+  --> $DIR/literals.rs:33:18
    |
-40 |     let fail10 = 0xBAFEBAFE;
-   |                  ^^^^^^^^^^ help: consider: `0xBAFE_BAFE`
-
-error: long literal lacking separators
-  --> $DIR/literals.rs:41:18
+LL |     let fail19 = 12_3456_21;
+   |                  ^^^^^^^^^^ help: consider: `12_345_621`
    |
-41 |     let fail11 = 0xabcdeff;
-   |                  ^^^^^^^^^ help: consider: `0x0abc_deff`
+   = note: `-D clippy::inconsistent-digit-grouping` implied by `-D warnings`
 
-error: long literal lacking separators
-  --> $DIR/literals.rs:42:18
+error: digits grouped inconsistently by underscores
+  --> $DIR/literals.rs:34:18
    |
-42 |     let fail12 = 0xabcabcabcabcabcabc;
-   |                  ^^^^^^^^^^^^^^^^^^^^ help: consider: `0x00ab_cabc_abca_bcab_cabc`
+LL |     let fail22 = 3__4___23;
+   |                  ^^^^^^^^^ help: consider: `3_423`
 
-error: digit groups should be smaller
-  --> $DIR/literals.rs:43:18
-   |
-43 |     let fail13 = 0x1_23456_78901_usize;
-   |                  ^^^^^^^^^^^^^^^^^^^^^ help: consider: `0x0123_4567_8901_usize`
+error: digits grouped inconsistently by underscores
+  --> $DIR/literals.rs:35:18
    |
-   = note: `-D large-digit-groups` implied by `-D warnings`
+LL |     let fail23 = 3__16___23;
+   |                  ^^^^^^^^^^ help: consider: `31_623`
 
-error: aborting due to 16 previous errors
+error: aborting due to 8 previous errors