From 227ff8c4ad881b99222d1f3feda559a8db95a8d3 Mon Sep 17 00:00:00 2001
From: mcarton <cartonmartin+git@gmail.com>
Date: Wed, 17 Feb 2016 13:38:44 +0100
Subject: [PATCH] Rustup to 1.8.0-nightly (57c357d89 2016-02-16)

---
 src/misc_early.rs | 10 +++++-----
 src/returns.rs    |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/misc_early.rs b/src/misc_early.rs
index 59a0102aa..cdc95c992 100644
--- a/src/misc_early.rs
+++ b/src/misc_early.rs
@@ -43,7 +43,7 @@ impl LintPass for MiscEarly {
 
 impl EarlyLintPass for MiscEarly {
     fn check_pat(&mut self, cx: &EarlyContext, pat: &Pat) {
-        if let PatStruct(ref npat, ref pfields, _) = pat.node {
+        if let PatKind::Struct(ref npat, ref pfields, _) = pat.node {
             let mut wilds = 0;
             let type_name = match npat.segments.last() {
                 Some(elem) => format!("{}", elem.identifier.name),
@@ -51,7 +51,7 @@ impl EarlyLintPass for MiscEarly {
             };
 
             for field in pfields {
-                if field.node.pat.node == PatWild {
+                if field.node.pat.node == PatKind::Wild {
                     wilds += 1;
                 }
             }
@@ -67,14 +67,14 @@ impl EarlyLintPass for MiscEarly {
                 let mut normal = vec![];
 
                 for field in pfields {
-                    if field.node.pat.node != PatWild {
+                    if field.node.pat.node != PatKind::Wild {
                         if let Ok(n) = cx.sess().codemap().span_to_snippet(field.span) {
                             normal.push(n);
                         }
                     }
                 }
                 for field in pfields {
-                    if field.node.pat.node == PatWild {
+                    if field.node.pat.node == PatKind::Wild {
                         wilds -= 1;
                         if wilds > 0 {
                             span_lint(cx,
@@ -101,7 +101,7 @@ impl EarlyLintPass for MiscEarly {
         let mut registered_names: HashMap<String, Span> = HashMap::new();
 
         for ref arg in &decl.inputs {
-            if let PatIdent(_, sp_ident, None) = arg.pat.node {
+            if let PatKind::Ident(_, sp_ident, None) = arg.pat.node {
                 let arg_name = sp_ident.node.to_string();
 
                 if arg_name.starts_with("_") {
diff --git a/src/returns.rs b/src/returns.rs
index 63864eafc..bfddee797 100644
--- a/src/returns.rs
+++ b/src/returns.rs
@@ -97,7 +97,7 @@ impl ReturnPass {
                 let StmtKind::Decl(ref decl, _) = stmt.node,
                 let DeclKind::Local(ref local) = decl.node,
                 let Some(ref initexpr) = local.init,
-                let PatIdent(_, Spanned { node: id, .. }, _) = local.pat.node,
+                let PatKind::Ident(_, Spanned { node: id, .. }, _) = local.pat.node,
                 let ExprKind::Path(_, ref path) = retexpr.node,
                 match_path_ast(path, &[&id.name.as_str()])
             ], {