From ac4b685650d1ba0a38806ce8f7cbf12e7a00f573 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Fran=C3=A7ois=20Mockers?= <mockersf@gmail.com>
Date: Tue, 18 Dec 2018 02:22:08 +0100
Subject: [PATCH] #56411 do not suggest a fix for a import conflict in a macro

---
 src/librustc_resolve/lib.rs           |  4 +++-
 src/test/ui/issues/issue-56411.rs     | 17 +++++++++++++++
 src/test/ui/issues/issue-56411.stderr | 31 +++++++++++++++++++++++++++
 src/test/ui/issues/issue_56411.rs     |  5 +++++
 4 files changed, 56 insertions(+), 1 deletion(-)
 create mode 100644 src/test/ui/issues/issue-56411.rs
 create mode 100644 src/test/ui/issues/issue-56411.stderr
 create mode 100644 src/test/ui/issues/issue_56411.rs

diff --git a/src/librustc_resolve/lib.rs b/src/librustc_resolve/lib.rs
index 4c9347afa61..8dd09076a00 100644
--- a/src/librustc_resolve/lib.rs
+++ b/src/librustc_resolve/lib.rs
@@ -5147,11 +5147,13 @@ fn report_conflict<'b>(&mut self,
             if let (
                 Ok(snippet),
                 NameBindingKind::Import { directive, ..},
-                _dummy @ false,
+                false,
+                false,
             ) = (
                 cm.span_to_snippet(binding.span),
                 binding.kind.clone(),
                 binding.span.is_dummy(),
+                binding.span.ctxt().outer().expn_info().is_some(),
             ) {
                 let suggested_name = if name.as_str().chars().next().unwrap().is_uppercase() {
                     format!("Other{}", name)
diff --git a/src/test/ui/issues/issue-56411.rs b/src/test/ui/issues/issue-56411.rs
new file mode 100644
index 00000000000..599f277123c
--- /dev/null
+++ b/src/test/ui/issues/issue-56411.rs
@@ -0,0 +1,17 @@
+macro_rules! import {
+    ( $($name:ident),* ) => {
+        $(
+            mod $name;
+            pub use self::$name;
+            //~^ ERROR the name `issue_56411` is defined multiple times
+            //~| ERROR `issue_56411` is private, and cannot be re-exported
+
+        )*
+    }
+}
+
+import!(issue_56411);
+
+fn main() {
+    println!("Hello, world!");
+}
diff --git a/src/test/ui/issues/issue-56411.stderr b/src/test/ui/issues/issue-56411.stderr
new file mode 100644
index 00000000000..842d86f4a3a
--- /dev/null
+++ b/src/test/ui/issues/issue-56411.stderr
@@ -0,0 +1,31 @@
+error[E0255]: the name `issue_56411` is defined multiple times
+  --> $DIR/issue-56411.rs:5:21
+   |
+LL |             mod $name;
+   |             ---------- previous definition of the module `issue_56411` here
+LL |             pub use self::$name;
+   |                     ^^^^^^^^^^^
+   |                     |
+   |                     `issue_56411` reimported here
+   |                     you can use `as` to change the binding name of the import
+...
+LL | import!(issue_56411);
+   | --------------------- in this macro invocation
+   |
+   = note: `issue_56411` must be defined only once in the type namespace of this module
+
+error[E0365]: `issue_56411` is private, and cannot be re-exported
+  --> $DIR/issue-56411.rs:5:21
+   |
+LL |             pub use self::$name;
+   |                     ^^^^^^^^^^^ re-export of private `issue_56411`
+...
+LL | import!(issue_56411);
+   | --------------------- in this macro invocation
+   |
+   = note: consider declaring type or module `issue_56411` with `pub`
+
+error: aborting due to 2 previous errors
+
+Some errors occurred: E0255, E0365.
+For more information about an error, try `rustc --explain E0255`.
diff --git a/src/test/ui/issues/issue_56411.rs b/src/test/ui/issues/issue_56411.rs
new file mode 100644
index 00000000000..bd689e913ab
--- /dev/null
+++ b/src/test/ui/issues/issue_56411.rs
@@ -0,0 +1,5 @@
+// compile-pass
+
+struct T {}
+
+fn main() {}
-- 
2.44.0