---

yaml
---
r: 60127
b: refs/heads/master
c: 3affc6e
h: refs/heads/master
i:
  60125: d4a58ca
  60123: 18f877e
  60119: aa345c5
  60111: 49c66fe
  60095: 973e1d0
v: v3

Author: pcwalton

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 9d011ebf67272879b9883013f7796b7639ecfda3
+refs/heads/master: 3affc6ed4071a183da81bcc2048fff82d3e35e81
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 2d28d645422c1617be58c8ca7ad9a457264ca850
 refs/heads/try: c50a9d5b664478e533ba1d1d353213d70c8ad589

trunk/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,

trunk/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,
         }
     }
 

trunk/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)
             }