bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

librustc: Fix merge fallout.

Browse source
This commit is contained in:
Patrick Walton 2013-05-08 09:03:31 -07:00
parent 9d011ebf67
commit 3affc6ed40
3 changed files with 4 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/librustc/middle/lint.rs
View file

@ -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,

8
src/libsyntax/ext/deriving/generic.rs
View file

@ -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,
}
}

2
src/libsyntax/ext/deriving/mod.rs
View file

@ -281,7 +281,7 @@ 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 ||
ast::named_field(ident, _) if (struct_type == Unknown ||
struct_type == Record) => {
struct_type = Record;
Some(ident)