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

Revert crate root changes

Browse Source
This commit is contained in:
varkor 2018-08-26 00:20:24 +01:00
parent 6642462ef6
commit a9d075e756
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -561,7 +561,13 @@ impl<'hir> Map<'hir> {
/// Retrieve the Node corresponding to `id`, returning None if
/// cannot be found.
pub fn find(&self, id: NodeId) -> Option<Node<'hir>> {
let result = self.find_entry(id).map(|x| x.node);
let result = self.find_entry(id).and_then(|entry| {
if let Node::Crate = entry.node {
None
} else {
Some(entry.node)
}
});
if result.is_some() {
self.read(id);
}
@ -632,6 +638,9 @@ impl<'hir> Map<'hir> {
}
if let Some(entry) = self.find_entry(parent_node) {
if let Node::Crate = entry.node {
return Err(id);
}
if found(&entry.node) {
return Ok(parent_node);
} else if bail_early(&entry.node) {