Skip to content

Commit 3fb5200

Browse files
committed
librustc: Fix merge fallout.
1 parent 687c25b commit 3fb5200

File tree

3 files changed

+4
-15
lines changed

3 files changed

+4
-15
lines changed

src/librustc/middle/lint.rs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -196,13 +196,6 @@ static lint_table: &'static [(&'static str, LintSpec)] = &[
196196
default: deny
197197
}),
198198

199-
("deprecated_mutable_fields",
200-
LintSpec {
201-
lint: deprecated_mutable_fields,
202-
desc: "deprecated mutable fields in structures",
203-
default: deny
204-
}),
205-
206199
("unused_unsafe",
207200
LintSpec {
208201
lint: unused_unsafe,

src/libsyntax/ext/deriving/generic.rs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -818,12 +818,8 @@ fn summarise_struct(cx: @ext_ctxt, span: span,
818818
let mut unnamed_count = 0;
819819
for struct_def.fields.each |field| {
820820
match field.node.kind {
821-
ast::named_field(ident, _, _) => {
822-
named_idents.push(ident)
823-
}
824-
ast::unnamed_field => {
825-
unnamed_count += 1;
826-
}
821+
ast::named_field(ident, _) => named_idents.push(ident),
822+
ast::unnamed_field => unnamed_count += 1,
827823
}
828824
}
829825

src/libsyntax/ext/deriving/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -281,8 +281,8 @@ pub fn create_struct_pattern(cx: @ext_ctxt,
281281

282282
for struct_def.fields.eachi |i, struct_field| {
283283
let opt_id = match struct_field.node.kind {
284-
ast::named_field(ident, _, _) if (struct_type == Unknown ||
285-
struct_type == Record) => {
284+
ast::named_field(ident, _) if (struct_type == Unknown ||
285+
struct_type == Record) => {
286286
struct_type = Record;
287287
Some(ident)
288288
}

0 commit comments

Comments
 (0)