Fix suggestion inside module

Author: phansch

src/librustc_resolve/diagnostics.rs

@@ -1006,10 +1006,11 @@ impl<'a> Resolver<'a> {
     crate fn make_undeclared_type_suggestion(
         &mut self,
         ident: Ident,
+        parent_scope: &ParentScope<'a>,
+        ns: Namespace,
     ) -> (String, Option<Suggestion>) {
-        let parent_scope = &ParentScope::module(self.graph_root);
         let typo_suggestion = self.early_lookup_typo_candidate(
-            ScopeSet::AbsolutePath(TypeNS),
+            ScopeSet::All(ns, false),
             parent_scope,
             ident,
             &|_| true,

src/librustc_resolve/lib.rs

@@ -2195,7 +2195,7 @@ impl<'a> Resolver<'a> {
                             return PathResult::NonModule(PartialRes::new(Res::Err));
                         }
                     } else if i == 0 {
-                        self.make_undeclared_type_suggestion(ident)
+                        self.make_undeclared_type_suggestion(ident, &parent_scope, ns)
                     } else {
                         (format!("could not find `{}` in `{}`", ident, path[i - 1].ident), None)
                     };

src/test/ui/resolve/suggest-type.rs

@@ -1,7 +1,14 @@
 use std::ffi::CString;
 
 mod foo {
-    fn bar() {}
+    use std::collections::HashMap;
+
+    fn bar() {
+        let _ = HashNap::new();
+        //~^ ERROR failed to resolve: use of undeclared type or module `HashNap`
+        //~| HELP a struct with a similar name exists
+        //~| SUGGESTION HashMap
+    }
 }
 
 fn main() {

src/test/ui/resolve/suggest-type.stderr

@@ -1,5 +1,14 @@
+error[E0433]: failed to resolve: use of undeclared type or module `HashNap`
+  --> $DIR/suggest-type.rs:7:17
+   |
+LL |         let _ = HashNap::new();
+   |                 ^^^^^^^
+   |                 |
+   |                 use of undeclared type or module `HashNap`
+   |                 help: a struct with a similar name exists: `HashMap`
+
 error[E0433]: failed to resolve: use of undeclared type or module `Cstring`
-  --> $DIR/suggest-type.rs:8:13
+  --> $DIR/suggest-type.rs:15:13
    |
 LL |     let _ = Cstring::new("hello").unwrap();
    |             ^^^^^^^
@@ -8,14 +17,14 @@ LL |     let _ = Cstring::new("hello").unwrap();
    |             help: a struct with a similar name exists (notice the capitalization): `CString`
 
 error[E0433]: failed to resolve: use of undeclared type or module `foO`
-  --> $DIR/suggest-type.rs:13:13
+  --> $DIR/suggest-type.rs:20:13
    |
 LL |     let _ = foO::bar();
    |             ^^^
    |             |
    |             use of undeclared type or module `foO`
    |             help: a module with a similar name exists (notice the capitalization): `foo`
 
-error: aborting due to 2 previous errors
+error: aborting due to 3 previous errors
 
 For more information about this error, try `rustc --explain E0433`.