Auto merge of #45013 - chrisvittal:mir_pretty_printing_pr, r=nikomatsakis

[rust.git] / src / librustc_resolve / resolve_imports.rs

diff --git a/src/librustc_resolve/resolve_imports.rs b/src/librustc_resolve/resolve_imports.rs
index 7524b7e8c6c215fab11417b379e1e3d07117f60d..b85bf18ea800c4fec42d0a7947aa566c4d49d3e6 100644 (file)
--- a/src/librustc_resolve/resolve_imports.rs
+++ b/src/librustc_resolve/resolve_imports.rs
@@ -844,7 +844,7 @@ fn finalize_resolutions_in(&mut self, module: Module<'b>) {
                 let def = binding.def();
                 if def != Def::Err {
                     if !def.def_id().is_local() {
-                        self.session.cstore.export_macros_untracked(def.def_id().krate);
+                        self.cstore.export_macros_untracked(def.def_id().krate);
                     }
                     if let Def::Macro(..) = def {
                         if let Some(&span) = exported_macro_names.get(&ident.modern()) {
@@ -892,8 +892,7 @@ fn finalize_resolutions_in(&mut self, module: Module<'b>) {
 
         if reexports.len() > 0 {
             if let Some(def_id) = module.def_id() {
-                let node_id = self.definitions.as_local_node_id(def_id).unwrap();
-                self.export_map.insert(node_id, reexports);
+                self.export_map.insert(def_id, reexports);
             }
         }
     }