Rollup merge of #41249 - GuillaumeGomez:rustdoc-render, r=steveklabnik,frewsxcv

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

diff --git a/src/librustc_resolve/lib.rs b/src/librustc_resolve/lib.rs
index a39cd3b0d551c059c26579d9abc0c1abbc2385a0..6ba214f20f98d3b15ad4d603894231f283c40dd8 100644 (file)
--- a/src/librustc_resolve/lib.rs
+++ b/src/librustc_resolve/lib.rs
@@ -1289,6 +1289,7 @@ fn definitions(&mut self) -> &mut Definitions {
 impl<'a> Resolver<'a> {
     pub fn new(session: &'a Session,
                krate: &Crate,
+               crate_name: &str,
                make_glob_map: MakeGlobMap,
                crate_loader: &'a mut CrateLoader,
                arenas: &'a ResolverArenas<'a>)
@@ -1303,7 +1304,8 @@ pub fn new(session: &'a Session,
         module_map.insert(DefId::local(CRATE_DEF_INDEX), graph_root);
 
         let mut definitions = Definitions::new();
-        DefCollector::new(&mut definitions).collect_root();
+        DefCollector::new(&mut definitions)
+            .collect_root(crate_name, &session.local_crate_disambiguator().as_str());
 
         let mut invocations = FxHashMap();
         invocations.insert(Mark::root(),
@@ -1707,7 +1709,7 @@ fn resolve_item(&mut self, item: &Item) {
                 }
             }
 
-            ItemKind::ExternCrate(_) | ItemKind::MacroDef(..) => {
+            ItemKind::ExternCrate(_) | ItemKind::MacroDef(..) | ItemKind::GlobalAsm(_)=> {
                 // do nothing, these are just around to be encoded
             }
 
@@ -2273,15 +2275,17 @@ fn smart_resolve_path_fragment(&mut self,
                 show_candidates(&mut err, &candidates, def.is_some());
             } else if is_expected(Def::Enum(DefId::local(CRATE_DEF_INDEX))) {
                 let enum_candidates = this.lookup_import_candidates(name, ns, is_enum_variant);
-                for suggestion in enum_candidates {
-                    let (variant_path, enum_path) = import_candidate_to_paths(&suggestion);
+                let mut enum_candidates = enum_candidates.iter()
+                    .map(|suggestion| import_candidate_to_paths(&suggestion)).collect::<Vec<_>>();
+                enum_candidates.sort();
+                for (sp, variant_path, enum_path) in enum_candidates {
                     let msg = format!("there is an enum variant `{}`, did you mean to use `{}`?",
                                       variant_path,
                                       enum_path);
-                    if suggestion.path.span == DUMMY_SP {
+                    if sp == DUMMY_SP {
                         err.help(&msg);
                     } else {
-                        err.span_help(suggestion.path.span, &msg);
+                        err.span_help(sp, &msg);
                     }
                 }
             }
@@ -3437,7 +3441,7 @@ fn path_names_to_string(path: &Path) -> String {
 }
 
 /// Get the path for an enum and the variant from an `ImportSuggestion` for an enum variant.
-fn import_candidate_to_paths(suggestion: &ImportSuggestion) -> (String, String) {
+fn import_candidate_to_paths(suggestion: &ImportSuggestion) -> (Span, String, String) {
     let variant_path = &suggestion.path;
     let variant_path_string = path_names_to_string(variant_path);
 
@@ -3448,7 +3452,7 @@ fn import_candidate_to_paths(suggestion: &ImportSuggestion) -> (String, String)
     };
     let enum_path_string = path_names_to_string(&enum_path);
 
-    (variant_path_string, enum_path_string)
+    (suggestion.path.span, variant_path_string, enum_path_string)
 }