Use get_module instead of module_map for resolve_str_path_error

jyn514 · jyn514 · commit 5271e98f4e8c · 2020-07-16T18:26:57.000-04:00
diff --git a/src/librustc_resolve/lib.rs b/src/librustc_resolve/lib.rs
@@ -2998,7 +2998,7 @@ impl<'a> Resolver<'a> {
                     .collect(),
             }
         };
-        let module = self.module_map.get(&module_id).copied().unwrap_or(self.graph_root);
+        let module = self.get_module(module_id.to_def_id());
         let parent_scope = &ParentScope::module(module);
         let res = self.resolve_ast_path(&path, ns, parent_scope).map_err(|_| ())?;
         Ok((path, res))

Original file line number	Diff line number	Diff line change
`@@ -2998,7 +2998,7 @@ impl<'a> Resolver<'a> {`
`2998`	`2998`	`.collect(),`
`2999`	`2999`	`}`
`3000`	`3000`	`};`
`3001`		`- let module = self.module_map.get(&module_id).copied().unwrap_or(self.graph_root);`
	`3001`	`+ let module = self.get_module(module_id.to_def_id());`
`3002`	`3002`	`let parent_scope = &ParentScope::module(module);`
`3003`	`3003`	`let res = self.resolve_ast_path(&path, ns, parent_scope).map_err(\|_\| ())?;`
`3004`	`3004`	`Ok((path, res))`