Skip to content

Commit

Permalink
Remove is_import field
Browse files Browse the repository at this point in the history
  • Loading branch information
Mark-Simulacrum committed Jun 3, 2018
1 parent 3575be6 commit 19e0b7d
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 14 deletions.
3 changes: 0 additions & 3 deletions src/librustc/hir/def.rs
Expand Up @@ -134,9 +134,6 @@ pub struct Export {
/// The visibility of the export.
/// We include non-`pub` exports for hygienic macros that get used from extern crates.
pub vis: ty::Visibility,
/// True if from a `use` or and `extern crate`.
/// Used in rustdoc.
pub is_import: bool,
}

impl CtorKind {
Expand Down
3 changes: 1 addition & 2 deletions src/librustc/ich/impls_hir.rs
Expand Up @@ -1115,8 +1115,7 @@ impl_stable_hash_for!(struct hir::def::Export {
ident,
def,
vis,
span,
is_import
span
});

impl<'a> HashStable<StableHashingContext<'a>>
Expand Down
9 changes: 3 additions & 6 deletions src/librustc_metadata/decoder.rs
Expand Up @@ -665,7 +665,6 @@ impl<'a, 'tcx> CrateMetadata {
def: def,
vis: ty::Visibility::Public,
span: DUMMY_SP,
is_import: false,
});
}
}
Expand Down Expand Up @@ -705,7 +704,6 @@ impl<'a, 'tcx> CrateMetadata {
ident: Ident::from_interned_str(self.item_name(child_index)),
vis: self.get_visibility(child_index),
span: self.entry(child_index).span.decode((self, sess)),
is_import: false,
});
}
}
Expand All @@ -722,8 +720,7 @@ impl<'a, 'tcx> CrateMetadata {
(self.get_def(child_index), def_key.disambiguated_data.data.get_opt_name()) {
let ident = Ident::from_interned_str(name);
let vis = self.get_visibility(child_index);
let is_import = false;
callback(def::Export { def, ident, vis, span, is_import });
callback(def::Export { def, ident, vis, span });
// For non-re-export structs and variants add their constructors to children.
// Re-export lists automatically contain constructors when necessary.
match def {
Expand All @@ -734,7 +731,7 @@ impl<'a, 'tcx> CrateMetadata {
callback(def::Export {
def: ctor_def,
vis: self.get_visibility(ctor_def_id.index),
ident, span, is_import,
ident, span,
});
}
}
Expand All @@ -744,7 +741,7 @@ impl<'a, 'tcx> CrateMetadata {
let ctor_kind = self.get_ctor_kind(child_index);
let ctor_def = Def::VariantCtor(def_id, ctor_kind);
let vis = self.get_visibility(child_index);
callback(def::Export { def: ctor_def, ident, vis, span, is_import });
callback(def::Export { def: ctor_def, ident, vis, span });
}
_ => {}
}
Expand Down
1 change: 0 additions & 1 deletion src/librustc_resolve/macros.rs
Expand Up @@ -803,7 +803,6 @@ impl<'a> Resolver<'a> {
def: def,
vis: ty::Visibility::Public,
span: item.span,
is_import: false,
});
} else {
self.unused_macros.insert(def_id);
Expand Down
1 change: 0 additions & 1 deletion src/librustc_resolve/resolve_imports.rs
Expand Up @@ -1008,7 +1008,6 @@ impl<'a, 'b:'a> ImportResolver<'a, 'b> {
def: def,
span: binding.span,
vis: binding.vis,
is_import: true,
});
}
}
Expand Down
3 changes: 2 additions & 1 deletion src/librustdoc/visit_lib.rs
Expand Up @@ -68,7 +68,8 @@ impl<'a, 'tcx, 'rcx> LibEmbargoVisitor<'a, 'tcx, 'rcx> {
}

for item in self.cx.tcx.item_children(def_id).iter() {
if !item.is_import || item.vis == Visibility::Public {
if self.cx.tcx.def_key(item.def.def_id()).parent.map_or(false, |d| d == def_id.index) ||
item.vis == Visibility::Public {
self.visit_item(item.def);
}
}
Expand Down

0 comments on commit 19e0b7d

Please sign in to comment.