diff --git a/ci/base-tests.sh b/ci/base-tests.sh index fbb5d1cba48d..64214e3be865 100755 --- a/ci/base-tests.sh +++ b/ci/base-tests.sh @@ -59,7 +59,9 @@ rustup override set nightly # avoid loop spam and allow cmds with exit status != 0 set +ex -for file in `find tests | grep "\.rs$"` ; do +# Excluding `ice-3891.rs` because the code triggers a rustc parse error which +# makes rustfmt fail. +for file in `find tests -not -path "tests/ui/crashes/ice-3891.rs" | grep "\.rs$"` ; do rustfmt ${file} --check if [ $? -ne 0 ]; then echo "${file} needs reformatting!" diff --git a/clippy_lints/src/literal_representation.rs b/clippy_lints/src/literal_representation.rs index 5c2ca4b1c935..e97845314f9d 100644 --- a/clippy_lints/src/literal_representation.rs +++ b/clippy_lints/src/literal_representation.rs @@ -526,23 +526,20 @@ impl LiteralRepresentation { if let Some(src) = snippet_opt(cx, lit.span); if let Some(firstch) = src.chars().next(); if char::to_digit(firstch, 10).is_some(); + let digit_info = DigitInfo::new(&src, false); + if digit_info.radix == Radix::Decimal; + if let Ok(val) = digit_info.digits + .chars() + .filter(|&c| c != '_') + .collect::() + .parse::(); + if val >= u128::from(self.threshold); then { - let digit_info = DigitInfo::new(&src, false); - if digit_info.radix == Radix::Decimal { - let val = digit_info.digits - .chars() - .filter(|&c| c != '_') - .collect::() - .parse::().unwrap(); - if val < u128::from(self.threshold) { - return - } - let hex = format!("{:#X}", val); - let digit_info = DigitInfo::new(&hex[..], false); - let _ = Self::do_lint(digit_info.digits).map_err(|warning_type| { - warning_type.display(&digit_info.grouping_hint(), cx, lit.span) - }); - } + let hex = format!("{:#X}", val); + let digit_info = DigitInfo::new(&hex, false); + let _ = Self::do_lint(digit_info.digits).map_err(|warning_type| { + warning_type.display(&digit_info.grouping_hint(), cx, lit.span) + }); } } } diff --git a/tests/ui/crashes/ice-3891.rs b/tests/ui/crashes/ice-3891.rs new file mode 100644 index 000000000000..05c5134c8457 --- /dev/null +++ b/tests/ui/crashes/ice-3891.rs @@ -0,0 +1,3 @@ +fn main() { + 1x; +} diff --git a/tests/ui/crashes/ice-3891.stderr b/tests/ui/crashes/ice-3891.stderr new file mode 100644 index 000000000000..16aedbd98dec --- /dev/null +++ b/tests/ui/crashes/ice-3891.stderr @@ -0,0 +1,10 @@ +error: invalid suffix `x` for numeric literal + --> $DIR/ice-3891.rs:2:5 + | +LL | 1x; + | ^^ invalid suffix `x` + | + = help: the suffix must be one of the integral types (`u32`, `isize`, etc) + +error: aborting due to previous error +