From 3affc6ed4071a183da81bcc2048fff82d3e35e81 Mon Sep 17 00:00:00 2001
From: Patrick Walton <pcwalton@mimiga.net>
Date: Wed, 8 May 2013 09:03:31 -0700
Subject: [PATCH] librustc: Fix merge fallout.

---
 src/librustc/middle/lint.rs           | 7 -------
 src/libsyntax/ext/deriving/generic.rs | 8 ++------
 src/libsyntax/ext/deriving/mod.rs     | 4 ++--
 3 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/src/librustc/middle/lint.rs b/src/librustc/middle/lint.rs
index ceb473da52f..b3bd60d8ac7 100644
--- a/src/librustc/middle/lint.rs
+++ b/src/librustc/middle/lint.rs
@@ -196,13 +196,6 @@ static lint_table: &'static [(&'static str, LintSpec)] = &[
         default: deny
      }),
 
-    ("deprecated_mutable_fields",
-     LintSpec {
-        lint: deprecated_mutable_fields,
-        desc: "deprecated mutable fields in structures",
-        default: deny
-    }),
-
     ("unused_unsafe",
      LintSpec {
         lint: unused_unsafe,
diff --git a/src/libsyntax/ext/deriving/generic.rs b/src/libsyntax/ext/deriving/generic.rs
index 565d6dd59ba..d785f3816de 100644
--- a/src/libsyntax/ext/deriving/generic.rs
+++ b/src/libsyntax/ext/deriving/generic.rs
@@ -818,12 +818,8 @@ fn summarise_struct(cx: @ext_ctxt, span: span,
     let mut unnamed_count = 0;
     for struct_def.fields.each |field| {
         match field.node.kind {
-            ast::named_field(ident, _, _) => {
-                named_idents.push(ident)
-            }
-            ast::unnamed_field => {
-                unnamed_count += 1;
-            }
+            ast::named_field(ident, _) => named_idents.push(ident),
+            ast::unnamed_field => unnamed_count += 1,
         }
     }
 
diff --git a/src/libsyntax/ext/deriving/mod.rs b/src/libsyntax/ext/deriving/mod.rs
index d48ff98be06..2bd45e1466c 100644
--- a/src/libsyntax/ext/deriving/mod.rs
+++ b/src/libsyntax/ext/deriving/mod.rs
@@ -281,8 +281,8 @@ pub fn create_struct_pattern(cx: @ext_ctxt,
 
     for struct_def.fields.eachi |i, struct_field| {
         let opt_id = match struct_field.node.kind {
-            ast::named_field(ident, _, _) if (struct_type == Unknown ||
-                                              struct_type == Record) => {
+            ast::named_field(ident, _) if (struct_type == Unknown ||
+                                           struct_type == Record) => {
                 struct_type = Record;
                 Some(ident)
             }