Skip to content

Commit 906faed

Browse files
committed
---
yaml --- r: 23171 b: refs/heads/master c: 395d1ac h: refs/heads/master i: 23169: 5bf5e35 23167: 9bc134b v: v3
1 parent 5b6920c commit 906faed

File tree

3 files changed

+10
-3
lines changed

3 files changed

+10
-3
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: 28cd0ad54b2a5fde7949dd76ebffcb0532085f43
2+
refs/heads/master: 395d1ac18598be88d71214691acfb3e820dc05a8
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
55
refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be

trunk/src/rustc/middle/resolve3.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -972,10 +972,10 @@ class Resolver {
972972
(*name_bindings).define_type(def_ty(local_def(item.id)), sp);
973973
}
974974

975-
// These items live in both the type and value namespaces.
976975
item_enum(enum_definition, _) => {
976+
977977
let (name_bindings, new_parent) = self.add_child(atom, parent,
978-
~[ValueNS, TypeNS], sp);
978+
~[TypeNS], sp);
979979

980980
(*name_bindings).define_type(def_ty(local_def(item.id)), sp);
981981

@@ -986,6 +986,8 @@ class Resolver {
986986
visitor);
987987
}
988988
}
989+
990+
// These items live in both the type and value namespaces.
989991
item_class(struct_definition, _) => {
990992
let (name_bindings, new_parent) =
991993
match struct_definition.ctor {

trunk/src/test/run-pass/issue-3186.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
enum y { x }
2+
3+
enum x {}
4+
5+
fn main() {}

0 commit comments

Comments
 (0)