Skip to content

Commit b0c4744

Browse files
committed
Auto merge of rust-lang#4956 - JohnTitor:decimal-lit-suffix, r=llogiq
Do not drop suffixes on `decimal_literal_representation` Fixes rust-lang#4763 changelog: Do not drop type suffixes on `decimal_literal_representation`
2 parents 87e628f + b68e65b commit b0c4744

File tree

4 files changed

+18
-2
lines changed

4 files changed

+18
-2
lines changed

clippy_lints/src/literal_representation.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -560,7 +560,7 @@ impl DecimalLiteralRepresentation {
560560
if val >= u128::from(self.threshold);
561561
then {
562562
let hex = format!("{:#X}", val);
563-
let num_lit = NumericLiteral::new(&hex, None, false);
563+
let num_lit = NumericLiteral::new(&hex, num_lit.suffix, false);
564564
let _ = Self::do_lint(num_lit.integer).map_err(|warning_type| {
565565
warning_type.display(num_lit.format(), cx, lit.span)
566566
});

tests/ui/decimal_literal_representation.fixed

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,7 @@ fn main() {
2121
0x7FFF_FFFF, // 0x7FFF_FFFF
2222
#[allow(overflowing_literals)]
2323
0xF0F0_F0F0, // 0xF0F0_F0F0
24+
0x8005_usize, // 0x8005_usize
25+
0x7F0F_F00F_isize, // 0x7F0F_F00F_isize
2426
);
2527
}

tests/ui/decimal_literal_representation.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,7 @@ fn main() {
2121
2_147_483_647, // 0x7FFF_FFFF
2222
#[allow(overflowing_literals)]
2323
4_042_322_160, // 0xF0F0_F0F0
24+
32_773usize, // 0x8005_usize
25+
2_131_750_927isize, // 0x7F0F_F00F_isize
2426
);
2527
}

tests/ui/decimal_literal_representation.stderr

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,17 @@ error: integer literal has a better hexadecimal representation
3030
LL | 4_042_322_160, // 0xF0F0_F0F0
3131
| ^^^^^^^^^^^^^ help: consider: `0xF0F0_F0F0`
3232

33-
error: aborting due to 5 previous errors
33+
error: integer literal has a better hexadecimal representation
34+
--> $DIR/decimal_literal_representation.rs:24:9
35+
|
36+
LL | 32_773usize, // 0x8005_usize
37+
| ^^^^^^^^^^^ help: consider: `0x8005_usize`
38+
39+
error: integer literal has a better hexadecimal representation
40+
--> $DIR/decimal_literal_representation.rs:25:9
41+
|
42+
LL | 2_131_750_927isize, // 0x7F0F_F00F_isize
43+
| ^^^^^^^^^^^^^^^^^^ help: consider: `0x7F0F_F00F_isize`
44+
45+
error: aborting due to 7 previous errors
3446

0 commit comments

Comments
 (0)