about summary refs log tree commit diff
path: root/src/test
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2018-12-29 12:55:48 +0000
committerbors <bors@rust-lang.org>2018-12-29 12:55:48 +0000
commit419044956a3fb8646772b6597f26a00d2316078b (patch)
treebe87574ab4a3682778dd6b932771b605c902949f /src/test
parentd5175f4405029cf456ca0cd44b438a7f86ffdc06 (diff)
parent2af1d6f4dd071e17816b08b19492bff2870926f4 (diff)
downloadrust-419044956a3fb8646772b6597f26a00d2316078b.tar.gz
rust-419044956a3fb8646772b6597f26a00d2316078b.zip
Auto merge of #57181 - petrochenkov:impice3, r=estebank
resolve: Fix another ICE in import validation

Imports are allowed to have ambiguous resolutions as long as all of them have same `Def`.
As it turned out, it's possible for different `Module`s to have same `Def` when `extern crate` items are involved.

Fixes https://github.com/rust-lang/rust/issues/56596
Diffstat (limited to 'src/test')
-rw-r--r--src/test/ui/rust-2018/uniform-paths/auxiliary/issue-56596-2.rs1
-rw-r--r--src/test/ui/rust-2018/uniform-paths/issue-56596-2.rs11
2 files changed, 12 insertions, 0 deletions
diff --git a/src/test/ui/rust-2018/uniform-paths/auxiliary/issue-56596-2.rs b/src/test/ui/rust-2018/uniform-paths/auxiliary/issue-56596-2.rs
new file mode 100644
index 00000000000..db723075f93
--- /dev/null
+++ b/src/test/ui/rust-2018/uniform-paths/auxiliary/issue-56596-2.rs
@@ -0,0 +1 @@
+pub extern crate core;
diff --git a/src/test/ui/rust-2018/uniform-paths/issue-56596-2.rs b/src/test/ui/rust-2018/uniform-paths/issue-56596-2.rs
new file mode 100644
index 00000000000..9ec3a641131
--- /dev/null
+++ b/src/test/ui/rust-2018/uniform-paths/issue-56596-2.rs
@@ -0,0 +1,11 @@
+// compile-pass
+// edition:2018
+// compile-flags: --extern issue_56596_2
+// aux-build:issue-56596-2.rs
+
+mod m {
+    use core::any;
+    pub use issue_56596_2::*;
+}
+
+fn main() {}