about summary refs log tree commit diff
path: root/src/test/ui/error-codes
diff options
context:
space:
mode:
authorVadim Petrochenkov <vadim.petrochenkov@gmail.com>2018-11-05 01:11:59 +0300
committerVadim Petrochenkov <vadim.petrochenkov@gmail.com>2018-11-18 13:51:40 +0300
commitf0ea1c6f1e2543b905ff486d227e951c8a20756c (patch)
tree3e07d994ea1cbbb79a24acb63660a9988fd62c02 /src/test/ui/error-codes
parent9d7d9ada6d108c113ea8728be97dbc19345e9892 (diff)
downloadrust-f0ea1c6f1e2543b905ff486d227e951c8a20756c.tar.gz
rust-f0ea1c6f1e2543b905ff486d227e951c8a20756c.zip
resolve: Improve diagnostics for resolution ambiguities
Diffstat (limited to 'src/test/ui/error-codes')
-rw-r--r--src/test/ui/error-codes/E0659.stderr9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/test/ui/error-codes/E0659.stderr b/src/test/ui/error-codes/E0659.stderr
index f168b7797ca..7bfe159405b 100644
--- a/src/test/ui/error-codes/E0659.stderr
+++ b/src/test/ui/error-codes/E0659.stderr
@@ -1,20 +1,21 @@
-error[E0659]: `foo` is ambiguous
+error[E0659]: `foo` is ambiguous (glob import vs glob import in the same module)
   --> $DIR/E0659.rs:25:15
    |
 LL |     collider::foo(); //~ ERROR E0659
    |               ^^^ ambiguous name
    |
-note: `foo` could refer to the name imported here
+note: `foo` could refer to the function imported here
   --> $DIR/E0659.rs:20:13
    |
 LL |     pub use moon::*;
    |             ^^^^^^^
-note: `foo` could also refer to the name imported here
+   = help: consider adding an explicit import of `foo` to disambiguate
+note: `foo` could also refer to the function imported here
   --> $DIR/E0659.rs:21:13
    |
 LL |     pub use earth::*;
    |             ^^^^^^^^
-   = note: consider adding an explicit import of `foo` to disambiguate
+   = help: consider adding an explicit import of `foo` to disambiguate
 
 error: aborting due to previous error