auto merge of #7443 : yjh0502/rust/fix_field_dup, r=huonw
Check if there is duplicated field names in struct.
This commit is contained in:
commit
0bd67f6891
@ -3846,6 +3846,27 @@ impl Resolver {
|
||||
generics: &Generics,
|
||||
fields: &[@struct_field],
|
||||
visitor: ResolveVisitor) {
|
||||
let mut ident_map = HashMap::new::<ast::ident, @struct_field>();
|
||||
for fields.iter().advance |&field| {
|
||||
match field.node.kind {
|
||||
named_field(ident, _) => {
|
||||
match ident_map.find(&ident) {
|
||||
Some(&prev_field) => {
|
||||
let ident_str = self.session.str_of(ident);
|
||||
self.session.span_err(field.span,
|
||||
fmt!("field `%s` is already declared", ident_str));
|
||||
self.session.span_note(prev_field.span,
|
||||
"Previously declared here");
|
||||
},
|
||||
None => {
|
||||
ident_map.insert(ident, field);
|
||||
}
|
||||
}
|
||||
}
|
||||
_ => ()
|
||||
}
|
||||
}
|
||||
|
||||
// If applicable, create a rib for the type parameters.
|
||||
do self.with_type_parameter_rib(HasTypeParameters
|
||||
(generics, id, 0,
|
||||
|
17
src/test/compile-fail/struct-fields-decl-dupe.rs
Normal file
17
src/test/compile-fail/struct-fields-decl-dupe.rs
Normal file
@ -0,0 +1,17 @@
|
||||
// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
|
||||
// file at the top-level directory of this distribution and at
|
||||
// http://rust-lang.org/COPYRIGHT.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
||||
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
||||
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
||||
// option. This file may not be copied, modified, or distributed
|
||||
// except according to those terms.
|
||||
|
||||
struct BuildData {
|
||||
foo: int,
|
||||
foo: int, //~ ERROR field `foo` is already declared
|
||||
}
|
||||
|
||||
fn main() {
|
||||
}
|
Loading…
Reference in New Issue
Block a user