Skip to content

Commit

Permalink
Fixes #7377
Browse files Browse the repository at this point in the history
  • Loading branch information
jihyun committed Jun 30, 2013
1 parent 36d7f60 commit 7bcde87
Show file tree
Hide file tree
Showing 2 changed files with 38 additions and 0 deletions.
21 changes: 21 additions & 0 deletions src/librustc/middle/resolve.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3886,6 +3886,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,
Expand Down
17 changes: 17 additions & 0 deletions src/test/compile-fail/struct-fields-decl-dupe.rs
Original file line number Diff line number Diff line change
@@ -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() {
}

9 comments on commit 7bcde87

@bors
Copy link
Contributor

@bors bors commented on 7bcde87 Jun 30, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from huonw
at yjh0502@7bcde87

@bors
Copy link
Contributor

@bors bors commented on 7bcde87 Jun 30, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging yjh0502/rust/fix_field_dup = 7bcde87 into auto

@bors
Copy link
Contributor

@bors bors commented on 7bcde87 Jun 30, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yjh0502/rust/fix_field_dup = 7bcde87 merged ok, testing candidate = 8409bf7d

@bors
Copy link
Contributor

@bors bors commented on 7bcde87 Jun 30, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bors
Copy link
Contributor

@bors bors commented on 7bcde87 Jul 1, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from huonw
at yjh0502@7bcde87

@bors
Copy link
Contributor

@bors bors commented on 7bcde87 Jul 1, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging yjh0502/rust/fix_field_dup = 7bcde87 into auto

@bors
Copy link
Contributor

@bors bors commented on 7bcde87 Jul 1, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yjh0502/rust/fix_field_dup = 7bcde87 merged ok, testing candidate = 0bd67f6

@bors
Copy link
Contributor

@bors bors commented on 7bcde87 Jul 1, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding master to auto = 0bd67f6

Please sign in to comment.