From: bors <bors@rust-lang.org>
Date: Mon, 28 Oct 2019 13:41:13 +0000 (+0000)
Subject: Auto merge of #65421 - estebank:variants, r=petrochenkov
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=8d78bf6b273848d17da8f5c92162c6a6b9b10dfd;p=rust.git

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

Point at local similarly named element and tweak references to variants

Partially address #65386.
---

8d78bf6b273848d17da8f5c92162c6a6b9b10dfd
diff --cc src/test/ui/privacy/privacy-ns2.stderr
index 58671addecd,48e06821cd6..6f54259f918
--- a/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>;
     |                 ^^^
     |