bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Refactor away DefModifiers::PRELUDE

Browse source
This commit is contained in:
Jeffrey Seyfried 2016-03-09 01:55:21 +00:00
parent febef471e3
commit 5a8845e40b
2 changed files with 12 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/librustc_resolve/lib.rs
View file

@ -932,8 +932,7 @@ bitflags! {
// Variants are considered `PUBLIC`, but some of them live in private enums. // Variants are considered `PUBLIC`, but some of them live in private enums.
// We need to track them to prohibit reexports like `pub use PrivEnum::Variant`. // We need to track them to prohibit reexports like `pub use PrivEnum::Variant`.
const PRIVATE_VARIANT = 1 << 2, const PRIVATE_VARIANT = 1 << 2,
const PRELUDE = 1 << 3, const GLOB_IMPORTED = 1 << 3,
const GLOB_IMPORTED = 1 << 4,
} }
} }

26
src/librustc_resolve/resolve_imports.rs
View file

@ -125,18 +125,17 @@ pub struct NameResolution<'a> {
impl<'a> NameResolution<'a> { impl<'a> NameResolution<'a> {
fn try_define(&mut self, binding: &'a NameBinding<'a>) -> Result<(), &'a NameBinding<'a>> { fn try_define(&mut self, binding: &'a NameBinding<'a>) -> Result<(), &'a NameBinding<'a>> {
match self.binding { if let Some(old_binding) = self.binding {
Some(old_binding) if !old_binding.defined_with(DefModifiers::PRELUDE) => { if binding.defined_with(DefModifiers::GLOB_IMPORTED) {
if binding.defined_with(DefModifiers::GLOB_IMPORTED) { self.duplicate_globs.push(binding);
self.duplicate_globs.push(binding); } else if old_binding.defined_with(DefModifiers::GLOB_IMPORTED) {
} else if old_binding.defined_with(DefModifiers::GLOB_IMPORTED) { self.duplicate_globs.push(old_binding);
self.duplicate_globs.push(old_binding); self.binding = Some(binding);
self.binding = Some(binding); } else {
} else { return Err(old_binding);
return Err(old_binding);
}
} }
_ => self.binding = Some(binding), } else {
self.binding = Some(binding);
} }
Ok(()) Ok(())
@ -160,7 +159,6 @@ impl<'a> NameResolution<'a> {
fn try_result(&self, allow_private_imports: bool) fn try_result(&self, allow_private_imports: bool)
-> Option<ResolveResult<&'a NameBinding<'a>>> { -> Option<ResolveResult<&'a NameBinding<'a>>> {
match self.result(allow_private_imports) { match self.result(allow_private_imports) {
Success(binding) if binding.defined_with(DefModifiers::PRELUDE) => None,
Failed(_) => None, Failed(_) => None,
result @ _ => Some(result), result @ _ => Some(result),
} }
@ -192,8 +190,6 @@ impl<'a> NameResolution<'a> {
}; };
for duplicate_glob in self.duplicate_globs.iter() { for duplicate_glob in self.duplicate_globs.iter() {
if duplicate_glob.defined_with(DefModifiers::PRELUDE) { continue }
// FIXME #31337: We currently allow items to shadow glob-imported re-exports. // FIXME #31337: We currently allow items to shadow glob-imported re-exports.
if !binding.is_import() { if !binding.is_import() {
if let NameBindingKind::Import { binding, .. } = duplicate_glob.kind { if let NameBindingKind::Import { binding, .. } = duplicate_glob.kind {
@ -360,7 +356,7 @@ impl<'a, 'b:'a, 'tcx:'b> ImportResolver<'a, 'b, 'tcx> {
// resolution for it so that later resolve stages won't complain. // resolution for it so that later resolve stages won't complain.
if let SingleImport { target, .. } = e.import_directive.subclass { if let SingleImport { target, .. } = e.import_directive.subclass {
let dummy_binding = self.resolver.arenas.alloc_name_binding(NameBinding { let dummy_binding = self.resolver.arenas.alloc_name_binding(NameBinding {
modifiers: DefModifiers::PRELUDE, modifiers: DefModifiers::GLOB_IMPORTED,
kind: NameBindingKind::Def(Def::Err), kind: NameBindingKind::Def(Def::Err),
span: None, span: None,
}); });