OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove the map field from Map

Browse Source
This commit is contained in:
John Kåre Alsaker 2020-02-08 04:24:42 +01:00
parent 072449c0dc
commit d99b17fa64
2 changed files with 0 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/librustc/hir/map/mod.rs
View File

@ -172,8 +172,6 @@ pub struct Map<'hir> {
pub(super) owner_map: FxHashMap<DefIndex, &'hir HirOwner<'hir>>,
pub(super) owner_items_map: FxHashMap<DefIndex, &'hir HirOwnerItems<'hir>>,
pub(super) map: HirEntryMap<'hir>,
pub(super) definitions: &'hir Definitions,
/// The reverse mapping of `node_to_hir_id`.
@ -220,27 +218,6 @@ impl<'hir> Map<'hir> {
&self.krate
}
#[inline]
fn lookup(&self, id: HirId) -> Option<&Entry<'hir>> {
let local_map = self.map.get(id.owner)?;
local_map.get(id.local_id)?.as_ref()
}
/// Registers a read in the dependency graph of the AST node with
/// the given `id`. This needs to be called each time a public
/// function returns the HIR for a node -- in other words, when it
/// "reveals" the content of a node to the caller (who might not
/// otherwise have had access to those contents, and hence needs a
/// read recorded). If the function just returns a DefId or
/// HirId, no actual content was returned, so no read is needed.
pub fn read(&self, hir_id: HirId) {
if let Some(entry) = self.lookup(hir_id) {
self.dep_graph.read_index(entry.dep_node);
} else {
bug!("called `HirMap::read()` with invalid `HirId`: {:?}", hir_id)
}
}
#[inline]
pub fn definitions(&self) -> &Definitions {
&self.definitions
@ -943,7 +920,6 @@ impl<'hir> Map<'hir> {
/// Given a node ID, gets a list of attributes associated with the AST
/// corresponding to the node-ID.
pub fn attrs(&self, id: HirId) -> &'hir [ast::Attribute] {
self.read(id); // reveals attributes on the node
let attrs = match self.find_entry(id).map(|entry| entry.node) {
Some(Node::Param(a)) => Some(&a.attrs[..]),
Some(Node::Local(l)) => Some(&l.attrs[..]),
@ -967,7 +943,6 @@ impl<'hir> Map<'hir> {
}
pub fn span(&self, hir_id: HirId) -> Span {
self.read(hir_id); // reveals span from node
match self.find_entry(hir_id).map(|entry| entry.node) {
Some(Node::Param(param)) => param.span,
Some(Node::Item(item)) => item.span,

2
src/librustc/hir/mod.rs
View File

@ -107,8 +107,6 @@ pub fn provide(providers: &mut Providers<'_>) {
owner_map: early.owner_map,
owner_items_map: early.owner_items_map,
map: early.map,
definitions: early.definitions,
hir_to_node_id: early.hir_to_node_id,