From 0307ff020ce40fc025aa81dc09e0e50e5e34849f Mon Sep 17 00:00:00 2001
From: Philipp Hansch <dev@phansch.net>
Date: Mon, 8 Apr 2019 22:06:02 +0200
Subject: [PATCH] Fix ICE in decimal_literal_representation lint

Handling the integer parsing properly instead of just unwrapping.

Note that the test is not catching the ICE because plain UI tests
[currently hide ICEs][compiletest_issue]. Once that issue is fixed, this
test would fail properly again.

[compiletest_issue]: https://github.com/laumann/compiletest-rs/issues/169
---
 clippy_lints/src/literal_representation.rs | 22 +++++++++++++---------
 tests/ui/crashes/ice-3891.rs               |  3 +++
 tests/ui/crashes/ice-3891.stderr           | 10 ++++++++++
 3 files changed, 26 insertions(+), 9 deletions(-)
 create mode 100644 tests/ui/crashes/ice-3891.rs
 create mode 100644 tests/ui/crashes/ice-3891.stderr

diff --git a/clippy_lints/src/literal_representation.rs b/clippy_lints/src/literal_representation.rs
index 5c2ca4b1c93..3ea818d3db6 100644
--- a/clippy_lints/src/literal_representation.rs
+++ b/clippy_lints/src/literal_representation.rs
@@ -529,19 +529,23 @@ fn check_lit(self, cx: &EarlyContext<'_>, lit: &Lit) {
             then {
                 let digit_info = DigitInfo::new(&src, false);
                 if digit_info.radix == Radix::Decimal {
-                    let val = digit_info.digits
+                    if let Ok(val) = digit_info.digits
                         .chars()
                         .filter(|&c| c != '_')
                         .collect::<String>()
-                        .parse::<u128>().unwrap();
-                    if val < u128::from(self.threshold) {
-                        return
+                        .parse::<u128>() {
+                        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)
-                    });
+                    else {
+                        return
+                    };
                 }
             }
         }
diff --git a/tests/ui/crashes/ice-3891.rs b/tests/ui/crashes/ice-3891.rs
new file mode 100644
index 00000000000..05c5134c845
--- /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 00000000000..16aedbd98de
--- /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
+
-- 
2.44.0