Auto merge of #65421 - estebank:variants, r=petrochenkov

Point at local similarly named element and tweak references to variants

Partially address #65386.

diff --cc src/librustc_resolve/build_reduced_graph.rs
Simple merge

diff --cc src/librustc_resolve/diagnostics.rs
Simple merge

diff --cc src/librustc_resolve/late.rs
Simple merge

diff --cc src/librustc_resolve/late/diagnostics.rs
Simple merge

diff --cc src/test/ui/privacy/privacy-ns2.rs
Simple merge

diff --cc src/test/ui/privacy/privacy-ns2.stderr
index 58671addecdedbb32c46f24b4510e1b97f4f4fc5,48e06821cd61c579d7a7ea90403cf08fbe5ae497..6f54259f91867fe1cb3ce9127e0c0eaaa29c0a65
--- 1/src/test/ui/privacy/privacy-ns2.stderr
--- 2/src/test/ui/privacy/privacy-ns2.stderr
+++ b/src/test/ui/privacy/privacy-ns2.stderr
@@@ -48,27 -51,11 +51,30 @@@ LL | use foo3::Bar
     |
  
  error[E0573]: expected type, found function `Bar`
 -  --> $DIR/privacy-ns2.rs:47:17
 +  --> $DIR/privacy-ns2.rs:42:14
 +   |
 +LL |     let _x : Bar();
 +   |              ^^^^^ not a type
 +   |
 +help: use `=` if you meant to assign
 +   |
 +LL |     let _x = Bar();
 +   |            ^
 +help: possible better candidates are found in other modules, you can import them into scope
 +   |
 +LL | use foo1::Bar;
 +   |
 +LL | use foo2::Bar;
 +   |
 +LL | use foo3::Bar;
 +   |
 +
 +error[E0573]: expected type, found function `Bar`
 +  --> $DIR/privacy-ns2.rs:48:17
     |
+ LL |     pub struct Baz;
+    |     --------------- similarly named struct `Baz` defined here
+ ...
  LL |     let _x: Box<Bar>;
     |                 ^^^
     |