nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-22 14:55:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

item_like_imports: Allow glob imports with a given visibility

Browse Source 
to reexport some (but not all) names with less visibility.
This commit is contained in:
Jeffrey Seyfried 2016-08-20 00:23:32 +00:00
parent c56a5afd4d
commit 097b6d62fc
2 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/librustc_resolve/build_reduced_graph.rs
View File

@ -26,6 +26,8 @@ use rustc::hir::def::*;
use rustc::hir::def_id::{CRATE_DEF_INDEX, DefId};
use rustc::ty::{self, VariantKind};
use std::cell::Cell;
use syntax::ast::Name;
use syntax::attr;
use syntax::parse::token;
@ -176,7 +178,10 @@ impl<'b> Resolver<'b> {
}
}
ViewPathGlob(_) => {
let subclass = GlobImport { is_prelude: is_prelude };
let subclass = GlobImport {
is_prelude: is_prelude,
max_vis: Cell::new(ty::Visibility::PrivateExternal),
};
let span = view_path.span;
self.add_import_directive(module_path, subclass, span, item.id, vis);
}

25
src/librustc_resolve/resolve_imports.rs
View File

@ -52,7 +52,10 @@ pub enum ImportDirectiveSubclass<'a> {
value_result: Cell<Result<&'a NameBinding<'a>, Determinacy>>,
type_result: Cell<Result<&'a NameBinding<'a>, Determinacy>>,
},
GlobImport { is_prelude: bool },
GlobImport {
is_prelude: bool,
max_vis: Cell<ty::Visibility>, // The visibility of the greatest reexport.
},
}
impl<'a> ImportDirectiveSubclass<'a> {
@ -276,7 +279,7 @@ impl<'a> Resolver<'a> {
}
// We don't add prelude imports to the globs since they only affect lexical scopes,
// which are not relevant to import resolution.
GlobImport { is_prelude: true } => {}
GlobImport { is_prelude: true, .. } => {}
GlobImport { .. } => self.current_module.globs.borrow_mut().push(directive),
}
}
@ -292,6 +295,12 @@ impl<'a> Resolver<'a> {
binding.pseudo_vis()
};
if let GlobImport { ref max_vis, .. } = directive.subclass {
if vis == directive.vis.get() || vis.is_at_least(max_vis.get(), self) {
max_vis.set(vis)
}
}
NameBinding {
kind: NameBindingKind::Import {
binding: binding,
@ -562,7 +571,15 @@ impl<'a, 'b:'a> ImportResolver<'a, 'b> {
let msg = "Cannot glob-import a module into itself.".into();
return Failed(Some((directive.span, msg)));
}
GlobImport { .. } => return Success(()),
GlobImport { is_prelude, ref max_vis } => {
if !is_prelude &&
max_vis.get() != ty::Visibility::PrivateExternal && // Allow empty globs.
!max_vis.get().is_at_least(directive.vis.get(), self) {
let msg = "A non-empty glob must import something with the glob's visibility";
self.session.span_err(directive.span, msg);
}
return Success(());
}
};
for &(ns, result) in &[(ValueNS, value_result), (TypeNS, type_result)] {
@ -677,7 +694,7 @@ impl<'a, 'b:'a> ImportResolver<'a, 'b> {
return;
} else if module.def_id() == directive.parent.def_id() {
return;
} else if let GlobImport { is_prelude: true } = directive.subclass {
} else if let GlobImport { is_prelude: true, .. } = directive.subclass {
self.prelude = Some(module);
return;
}