diff --git a/src/librustc/middle/lint.rs b/src/librustc/middle/lint.rs index ceb473da52fc0d008326e2149b2bcb8fa56dfe96..b3bd60d8ac7be80f8bd67a7e3af0138e63bdf40b 100644 --- a/src/librustc/middle/lint.rs +++ b/src/librustc/middle/lint.rs @@ -196,13 +196,6 @@ struct 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 565d6dd59baac533fb72371ebe3ffafe99e76d2f..d785f3816de30f0b07794b57882f71e2e89b2661 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 d48ff98be06ee873cf3c45daafd0b31dfae5b319..2bd45e1466ce735e5f1aaadd7727abd3fcfaed91 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) }