From 5ed8e98ea220d797c213a356f354b958f4ccfc49 Mon Sep 17 00:00:00 2001
From: Dirk Gadsden <dirk@esherido.com>
Date: Sun, 31 Jan 2016 19:26:16 -0800
Subject: Add fake import resolutions & targets for names in bad imports

---
 src/test/compile-fail/import-from-missing.rs | 7 +++++--
 src/test/compile-fail/import2.rs             | 6 +++---
 src/test/compile-fail/privacy3.rs            | 4 +++-
 3 files changed, 11 insertions(+), 6 deletions(-)

(limited to 'src/test')

diff --git a/src/test/compile-fail/import-from-missing.rs b/src/test/compile-fail/import-from-missing.rs
index 489bcfbdefd..bcd2cd816ed 100644
--- a/src/test/compile-fail/import-from-missing.rs
+++ b/src/test/compile-fail/import-from-missing.rs
@@ -15,5 +15,8 @@ mod spam {
     pub fn ham() { }
 }
 
-fn main() { ham(); eggs(); }
-//~^ ERROR unresolved name `eggs`
+fn main() {
+    ham();
+    // Expect eggs to pass because the compiler inserts a fake name for it
+    eggs();
+}
diff --git a/src/test/compile-fail/import2.rs b/src/test/compile-fail/import2.rs
index 1d2aecd4e3b..1f25bce2093 100644
--- a/src/test/compile-fail/import2.rs
+++ b/src/test/compile-fail/import2.rs
@@ -11,10 +11,10 @@
 use baz::zed::bar;
 //~^ ERROR unresolved import `baz::zed::bar`. Could not find `zed` in `baz`
 
-
 mod baz {}
 mod zed {
     pub fn bar() { println!("bar3"); }
 }
-fn main() { bar(); }
-//~^ ERROR unresolved name `bar`
+fn main() {
+    bar();
+}
diff --git a/src/test/compile-fail/privacy3.rs b/src/test/compile-fail/privacy3.rs
index 6a203993ccf..89f38fa1434 100644
--- a/src/test/compile-fail/privacy3.rs
+++ b/src/test/compile-fail/privacy3.rs
@@ -27,8 +27,10 @@ pub fn foo() {}
 fn test1() {
     use bar::gpriv;
     //~^ ERROR unresolved import `bar::gpriv`. There is no `gpriv` in `bar`
+
+    // This should pass because the compiler will insert a fake name binding
+    // for `gpriv`
     gpriv();
-    //~^ ERROR unresolved name `gpriv`
 }
 
 #[start] fn main(_: isize, _: *const *const u8) -> isize { 3 }
-- 
cgit 1.4.1-3-g733a5