---

yaml
---
r: 59672
b: refs/heads/snap-stage3
c: 6886315
h: refs/heads/master
v: v3

Author: emberian

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: c081ffbd1e845687202a975ea2e698b623e5722f
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 8a69dba84a1be53949d0c24452b9910c7119ed68
+refs/heads/snap-stage3: 68863153bba3ab994978b49216cb58641e7a9fbb
 refs/heads/try: c50a9d5b664478e533ba1d1d353213d70c8ad589
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/test/compile-fail/issue-2123.rs

@@ -9,6 +9,7 @@
 // except according to those terms.
 
 use x = m::f; //~ ERROR failed to resolve import
+              //~^ unresolved import: there is no `f` in `m`
 
 mod m {
 }

branches/snap-stage3/src/test/compile-fail/issue-2937.rs

@@ -9,6 +9,7 @@
 // except according to those terms.
 
 use x = m::f; //~ ERROR failed to resolve import
+              //~^ ERROR unresolved import: there is no `f` in `m`
 
 mod m {
 }

branches/snap-stage3/src/test/compile-fail/issue-3993-2.rs

@@ -9,6 +9,7 @@
 // except according to those terms.
 
 use zoo::{duck, goose}; //~ ERROR failed to resolve import
+                        //~^ ERROR unresolved import: found `goose` in `zoo` but it is private
 
 mod zoo {
     pub enum bird {

branches/snap-stage3/src/test/compile-fail/issue-3993-3.rs

@@ -9,6 +9,7 @@
 // except according to those terms.
 
 use zoo::fly; //~ ERROR failed to resolve import
+              //~^ ERROR unresolved import: found `fly` in `zoo` but it is private
 
 mod zoo {
     priv type fly = ();

branches/snap-stage3/src/test/compile-fail/issue-3993.rs

@@ -9,6 +9,7 @@
 // except according to those terms.
 
 use zoo::fly; //~ ERROR failed to resolve import
+              //~^ ERROR unresolved import: found `fly` in `zoo` but it is private
 
 mod zoo {
     priv fn fly() {}

branches/snap-stage3/src/test/compile-fail/super-at-top-level.rs

@@ -1,5 +1,4 @@
-use super::f;   //~ ERROR unresolved name
-//~^ ERROR failed to resolve import
+use super::f; //~ ERROR failed to resolve import
 
 fn main() {
 }