Fix merge conflict

diff --git a/src/librustc/hir/map/mod.rs b/src/librustc/hir/map/mod.rs
index b4e00455a743b7f0a3b0fa007f9f7f7b82cc8187..31b0b5c820e3d39c39f529f8a1fd9aa191762ed9 100644 (file)
--- a/src/librustc/hir/map/mod.rs
+++ b/src/librustc/hir/map/mod.rs
@@ -153,7 +153,7 @@ fn to_node(self) -> Option<Node<'hir>> {
             EntryLocal(_, _, n) => NodeLocal(n),
 
             NotPresent |
-            RootCrate => return None
+            RootCrate(_) => return None
         })
     }