Add unwrap to options.

Author: xiongmao86

clippy_lints/src/matches.rs

@@ -713,8 +713,8 @@ fn all_ranges<'a, 'tcx>(cx: &LateContext<'a, 'tcx>, arms: &'tcx [Arm<'_>]) -> Ve
             } = *arm
             {
                 if let PatKind::Range(ref lhs, ref rhs, ref range_end) = pat.kind {
-                    let lhs = constant(cx, cx.tables, lhs)?.0;
-                    let rhs = constant(cx, cx.tables, rhs)?.0;
+                    let lhs = constant(cx, cx.tables, lhs.unwrap())?.0;
+                    let rhs = constant(cx, cx.tables, rhs.unwrap())?.0;
                     let rhs = match *range_end {
                         RangeEnd::Included => Bound::Included(rhs),
                         RangeEnd::Excluded => Bound::Excluded(rhs),

clippy_lints/src/utils/author.rs

@@ -617,9 +617,9 @@ impl<'tcx> Visitor<'tcx> for PrintVisitor {
                     start_pat, end_pat, end_kind, current
                 );
                 self.current = start_pat;
-                self.visit_expr(start);
+                self.visit_expr(start.unwrap());
                 self.current = end_pat;
-                self.visit_expr(end);
+                self.visit_expr(end.unwrap());
             },
             PatKind::Slice(ref start, ref middle, ref end) => {
                 let start_pat = self.next("start");

clippy_lints/src/utils/hir_utils.rs

@@ -195,7 +195,7 @@ impl<'a, 'tcx> SpanlessEq<'a, 'tcx> {
                 ls == rs && over(l, r, |l, r| self.eq_pat(l, r))
             },
             (&PatKind::Range(ref ls, ref le, ref li), &PatKind::Range(ref rs, ref re, ref ri)) => {
-                self.eq_expr(ls, rs) && self.eq_expr(le, re) && (*li == *ri)
+                self.eq_expr(ls.unwrap(), rs.unwrap()) && self.eq_expr(le.unwrap(), re.unwrap()) && (*li == *ri)
             },
             (&PatKind::Ref(ref le, ref lm), &PatKind::Ref(ref re, ref rm)) => lm == rm && self.eq_pat(le, re),
             (&PatKind::Slice(ref ls, ref li, ref le), &PatKind::Slice(ref rs, ref ri, ref re)) => {

clippy_lints/src/utils/inspector.rs

@@ -483,8 +483,8 @@ fn print_pat(cx: &LateContext<'_, '_>, pat: &hir::Pat<'_>, indent: usize) {
         },
         hir::PatKind::Range(ref l, ref r, ref range_end) => {
             println!("{}Range", ind);
-            print_expr(cx, l, indent + 1);
-            print_expr(cx, r, indent + 1);
+            print_expr(cx, l.unwrap(), indent + 1);
+            print_expr(cx, r.unwrap(), indent + 1);
             match *range_end {
                 hir::RangeEnd::Included => println!("{} end included", ind),
                 hir::RangeEnd::Excluded => println!("{} end excluded", ind),