about summary refs log tree commit diff
path: root/src/test
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2016-03-09 22:41:48 -0800
committerbors <bors@rust-lang.org>2016-03-09 22:41:48 -0800
commit3ac4076ac0e4276dce59cd254dfa2c5cf848dca8 (patch)
treeffbdc315bd3e6d7efab537efa1f1f6cab164ae03 /src/test
parentbcda58f49133921abd091d7f800732fe2c4e5a98 (diff)
parent4dc4cae79a07017695889b672d335e7c63c95416 (diff)
downloadrust-3ac4076ac0e4276dce59cd254dfa2c5cf848dca8.tar.gz
rust-3ac4076ac0e4276dce59cd254dfa2c5cf848dca8.zip
Auto merge of #32097 - jseyfried:fix_resolution_regression, r=nikomatsakis
Fix a regression in import resolution

This fixes #32089 (caused by #31726) by deducing that name resolution has failed (as opposed to being determinate) in more cases.

r? @nikomatsakis
Diffstat (limited to 'src/test')
-rw-r--r--src/test/compile-fail/issue-32089.rs23
1 files changed, 23 insertions, 0 deletions
diff --git a/src/test/compile-fail/issue-32089.rs b/src/test/compile-fail/issue-32089.rs
new file mode 100644
index 00000000000..5da7b9fff6e
--- /dev/null
+++ b/src/test/compile-fail/issue-32089.rs
@@ -0,0 +1,23 @@
+// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+#![feature(rustc_attrs)]
+#![allow(unused_imports)]
+
+pub type Type = i32;
+
+mod one { use super::Type; }
+pub use self::one::*;
+
+mod two { use super::Type; }
+pub use self::two::*;
+
+#[rustc_error]
+fn main() {} //~ ERROR compilation successful