user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

auto merge of #7267 : luqmana/rust/issue-5792, r=cmr

Browse source 
Fixes #5792
This commit is contained in:
bors 2013-06-23 07:52:55 -07:00
commit c17ff80e01
2 changed files with 27 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/librustc/middle/resolve.rs
View file

@ -1415,24 +1415,26 @@ impl Resolver {
(ReducedGraphParent,
vt<ReducedGraphParent>)) {
let ident = variant.node.name;
let (child, _) = self.add_child(ident, parent, ForbidDuplicateValues,
variant.span);
let privacy;
match variant.node.vis {
public => privacy = Public,
private => privacy = Private,
inherited => privacy = parent_privacy
}
let privacy =
match variant.node.vis {
public => Public,
private => Private,
inherited => parent_privacy
};
match variant.node.kind {
tuple_variant_kind(_) => {
let (child, _) = self.add_child(ident, parent, ForbidDuplicateValues,
variant.span);
child.define_value(privacy,
def_variant(item_id,
local_def(variant.node.id)),
variant.span);
}
struct_variant_kind(_) => {
let (child, _) = self.add_child(ident, parent, ForbidDuplicateTypesAndValues,
variant.span);
child.define_type(privacy,
def_variant(item_id,
local_def(variant.node.id)),