From e43eddce4ea3f50e17505e22b3c178ef15b40c54 Mon Sep 17 00:00:00 2001
From: Manish Goregaokar <manishsmail@gmail.com>
Date: Fri, 3 May 2019 22:00:21 -0700
Subject: [PATCH] Make it compile

---
 clippy_lints/src/loops.rs         | 6 +++---
 clippy_lints/src/misc.rs          | 2 +-
 clippy_lints/src/question_mark.rs | 2 +-
 clippy_lints/src/use_self.rs      | 2 +-
 clippy_lints/src/utils/usage.rs   | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/clippy_lints/src/loops.rs b/clippy_lints/src/loops.rs
index f8398e4ee04c..4c1f5efbe3b0 100644
--- a/clippy_lints/src/loops.rs
+++ b/clippy_lints/src/loops.rs
@@ -1774,7 +1774,7 @@ impl<'a, 'tcx> VarVisitor<'a, 'tcx> {
                     }
                     let res = self.cx.tables.qpath_res(seqpath, seqexpr.hir_id);
                     match res {
-                        Res::Local(hir_id) | Res::Def(Res::Upvar(..), hir_id, ..) => {
+                        Res::Local(hir_id) | Res::Upvar(hir_id, ..) => {
                             let parent_id = self.cx.tcx.hir().get_parent_item(expr.hir_id);
                             let parent_def_id = self.cx.tcx.hir().local_def_id_from_hir_id(parent_id);
                             let extent = self.cx.tcx.region_scope_tree(parent_def_id).var_scope(hir_id.local_id);
@@ -1835,7 +1835,7 @@ impl<'a, 'tcx> Visitor<'tcx> for VarVisitor<'a, 'tcx> {
             if path.segments.len() == 1;
             then {
                 match self.cx.tables.qpath_res(qpath, expr.hir_id) {
-                    Res::Def(Res::Upvar(..), local_id, ..) => {
+                    Res::Upvar(local_id, ..) => {
                         if local_id == self.var {
                             // we are not indexing anything, record that
                             self.nonindex = true;
@@ -2383,7 +2383,7 @@ impl<'a, 'tcx> VarCollectorVisitor<'a, 'tcx> {
             let res = self.cx.tables.qpath_res(qpath, ex.hir_id);
             then {
                 match res {
-                    Res::Local(node_id) | Res::Def(Res::Upvar(..), node_id, ..) => {
+                    Res::Local(node_id) | Res::Upvar(node_id, ..) => {
                         self.ids.insert(node_id);
                     },
                     Res::Def(DefKind::Static, def_id) => {
diff --git a/clippy_lints/src/misc.rs b/clippy_lints/src/misc.rs
index a5b420709af9..0b2504a5b06e 100644
--- a/clippy_lints/src/misc.rs
+++ b/clippy_lints/src/misc.rs
@@ -603,7 +603,7 @@ fn in_attributes_expansion(expr: &Expr) -> bool {
 /// Tests whether `res` is a variable defined outside a macro.
 fn non_macro_local(cx: &LateContext<'_, '_>, res: def::Res) -> bool {
     match res {
-        def::Res::Local(id) | def::Res(Res::Upvar(..), id, _, _) => !in_macro(cx.tcx.hir().span_by_hir_id(id)),
+        def::Res::Local(id) | def::Res::Upvar(id, ..) => !in_macro(cx.tcx.hir().span_by_hir_id(id)),
         _ => false,
     }
 }
diff --git a/clippy_lints/src/question_mark.rs b/clippy_lints/src/question_mark.rs
index 3849b5bb00c0..808fae2778cf 100644
--- a/clippy_lints/src/question_mark.rs
+++ b/clippy_lints/src/question_mark.rs
@@ -117,7 +117,7 @@ impl QuestionMark {
             },
             ExprKind::Ret(Some(ref expr)) => Self::expression_returns_none(cx, expr),
             ExprKind::Path(ref qp) => {
-                if let Res::Def(DefKind::Ctor(_, def::CtorOf::Variant), def_id) = cx.tables.qpath_res(qp, expression.hir_id) {
+                if let Res::Def(DefKind::Ctor(def::CtorOf::Variant, def::CtorKind::Const), def_id) = cx.tables.qpath_res(qp, expression.hir_id) {
                     return cx.match_def_path(def_id, &OPTION_NONE);
                 }
 
diff --git a/clippy_lints/src/use_self.rs b/clippy_lints/src/use_self.rs
index 712cc779aff6..1a0a3474d88b 100644
--- a/clippy_lints/src/use_self.rs
+++ b/clippy_lints/src/use_self.rs
@@ -223,7 +223,7 @@ impl<'a, 'tcx> Visitor<'tcx> for UseSelfVisitor<'a, 'tcx> {
         if path.segments.last().expect(SEGMENTS_MSG).ident.name != SelfUpper.name() {
             if self.item_path.res == path.res {
                 span_use_self_lint(self.cx, path);
-            } else if let Res::Def(DefKind::Ctor(def::CtorOf::Struct, ctor_did), CtorKind::Fn) = path.res {
+            } else if let Res::Def(DefKind::Ctor(def::CtorOf::Struct, CtorKind::Fn), ctor_did) = path.res {
                 if self.item_path.res.opt_def_id() == self.cx.tcx.parent(ctor_did) {
                     span_use_self_lint(self.cx, path);
                 }
diff --git a/clippy_lints/src/utils/usage.rs b/clippy_lints/src/utils/usage.rs
index 1ee8d947a009..69dc8ec84ba1 100644
--- a/clippy_lints/src/utils/usage.rs
+++ b/clippy_lints/src/utils/usage.rs
@@ -30,7 +30,7 @@ pub fn is_potentially_mutated<'a, 'tcx: 'a>(
     cx: &'a LateContext<'a, 'tcx>,
 ) -> bool {
     let id = match variable.res {
-        Res::Local(id) | Res::Def(Res::Upvar(..), id, ..) => id,
+        Res::Local(id) | Res::Upvar(id, ..) => id,
         _ => return true,
     };
     mutated_variables(expr, cx).map_or(true, |mutated| mutated.contains(&id))