Skip to content

Commit 3f955f4

Browse files
committed
---
yaml --- r: 29771 b: refs/heads/incoming c: 395d1ac h: refs/heads/master i: 29769: 7308115 29767: 45a057b v: v3
1 parent c3079e7 commit 3f955f4

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
@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
9-
refs/heads/incoming: 28cd0ad54b2a5fde7949dd76ebffcb0532085f43
9+
refs/heads/incoming: 395d1ac18598be88d71214691acfb3e820dc05a8
1010
refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
1111
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1212
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/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 {
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)