Add missings NOTE and HELP annotations to tests

11 files changed, 32 insertions, 9 deletions

diff --git a/src/test/compile-fail/changing-crates.rs b/src/test/compile-fail/changing-crates.rs
index ae3ef760667..798f4ef74b8 100644
--- a/src/test/compile-fail/changing-crates.rs
+++ b/src/test/compile-fail/changing-crates.rs
@@ -15,6 +15,8 @@
 
 extern crate a;
 extern crate b; //~ ERROR: found possibly newer version of crate `a` which `b` depends on
-//~^ NOTE: perhaps this crate needs to be recompiled
+//~| NOTE: perhaps this crate needs to be recompiled
+//~| NOTE: crate `a` path #1:
+//~| NOTE: crate `b` path #1:
 
 fn main() {}
diff --git a/src/test/compile-fail/default_ty_param_conflict_cross_crate.rs b/src/test/compile-fail/default_ty_param_conflict_cross_crate.rs
index 4d60724372a..fc2c49d65af 100644
--- a/src/test/compile-fail/default_ty_param_conflict_cross_crate.rs
+++ b/src/test/compile-fail/default_ty_param_conflict_cross_crate.rs
@@ -26,4 +26,5 @@ fn main() {
     meh(foo);
     //~^ ERROR: mismatched types:
     //~| NOTE: conflicting type parameter defaults `bool` and `char`
+    //~| NOTE:  ...that was applied to an unconstrained type variable here
 }
diff --git a/src/test/compile-fail/lifetime-inference-give-expl-lifetime-param.rs b/src/test/compile-fail/lifetime-inference-give-expl-lifetime-param.rs
index a85776a938b..e32ed1c42a0 100644
--- a/src/test/compile-fail/lifetime-inference-give-expl-lifetime-param.rs
+++ b/src/test/compile-fail/lifetime-inference-give-expl-lifetime-param.rs
@@ -49,6 +49,7 @@ struct Baz<'x> {
 
 impl<'a> Baz<'a> {
     fn baz2<'b>(&self, x: &isize) -> (&'b isize, &'b isize) {
+         //~^ HELP: parameter as shown: fn baz2<'b>(&self, x: &'b isize) -> (&'a isize, &'a isize)
         // The lifetime that gets assigned to `x` seems somewhat random.
         // I have disabled this test for the time being. --pcwalton
         (self.bar, x) //~ ERROR: cannot infer
diff --git a/src/test/compile-fail/privacy1.rs b/src/test/compile-fail/privacy1.rs
index 593068c2aea..495cdc3fe62 100644
--- a/src/test/compile-fail/privacy1.rs
+++ b/src/test/compile-fail/privacy1.rs
@@ -129,12 +129,17 @@ mod foo {
         ::bar::baz::foo(); //~ ERROR: function `foo` is inaccessible
                            //~^ NOTE: module `baz` is private
         ::bar::baz::bar(); //~ ERROR: function `bar` is inaccessible
+                           //~^ NOTE: module `baz` is private
     }
 
     fn test2() {
         use bar::baz::{foo, bar};
         //~^ ERROR: function `foo` is inaccessible
-        //~^^ ERROR: function `bar` is inaccessible
+        //~| NOTE: module `baz` is private
+        //~| ERROR: function `bar` is inaccessible
+        //~| NOTE: module `baz` is private
+
+
         foo();
         bar();
     }
diff --git a/src/test/compile-fail/svh-change-lit.rs b/src/test/compile-fail/svh-change-lit.rs
index c839ade75cf..24627c4ef0f 100644
--- a/src/test/compile-fail/svh-change-lit.rs
+++ b/src/test/compile-fail/svh-change-lit.rs
@@ -15,7 +15,9 @@
 
 extern crate a;
 extern crate b; //~ ERROR: found possibly newer version of crate `a` which `b` depends on
-//~^ NOTE: perhaps this crate needs to be recompiled
+//~| NOTE: perhaps this crate needs to be recompiled
+//~| NOTE: crate `a` path #1:
+//~| NOTE: crate `b` path #1:
 
 fn main() {
     b::foo()
diff --git a/src/test/compile-fail/svh-change-significant-cfg.rs b/src/test/compile-fail/svh-change-significant-cfg.rs
index df0adf36ce2..fd3065ccb63 100644
--- a/src/test/compile-fail/svh-change-significant-cfg.rs
+++ b/src/test/compile-fail/svh-change-significant-cfg.rs
@@ -15,7 +15,9 @@
 
 extern crate a;
 extern crate b; //~ ERROR: found possibly newer version of crate `a` which `b` depends on
-//~^ NOTE: perhaps this crate needs to be recompiled
+//~| NOTE: perhaps this crate needs to be recompiled
+//~| NOTE: crate `a` path #1:
+//~| NOTE: crate `b` path #1:
 
 fn main() {
     b::foo()
diff --git a/src/test/compile-fail/svh-change-trait-bound.rs b/src/test/compile-fail/svh-change-trait-bound.rs
index 4774384fecd..aa8ec911a3b 100644
--- a/src/test/compile-fail/svh-change-trait-bound.rs
+++ b/src/test/compile-fail/svh-change-trait-bound.rs
@@ -15,7 +15,9 @@
 
 extern crate a;
 extern crate b; //~ ERROR: found possibly newer version of crate `a` which `b` depends on
-//~^ NOTE: perhaps this crate needs to be recompiled
+//~| NOTE: perhaps this crate needs to be recompiled
+//~| NOTE: crate `a` path #1:
+//~| NOTE: crate `b` path #1:
 
 fn main() {
     b::foo()
diff --git a/src/test/compile-fail/svh-change-type-arg.rs b/src/test/compile-fail/svh-change-type-arg.rs
index 51d3fd0a73a..953813a8422 100644
--- a/src/test/compile-fail/svh-change-type-arg.rs
+++ b/src/test/compile-fail/svh-change-type-arg.rs
@@ -15,7 +15,9 @@
 
 extern crate a;
 extern crate b; //~ ERROR: found possibly newer version of crate `a` which `b` depends on
-//~^ NOTE: perhaps this crate needs to be recompiled
+//~| NOTE: perhaps this crate needs to be recompiled
+//~| NOTE: crate `a` path #1:
+//~| NOTE: crate `b` path #1:
 
 fn main() {
     b::foo()
diff --git a/src/test/compile-fail/svh-change-type-ret.rs b/src/test/compile-fail/svh-change-type-ret.rs
index 609e0f3689e..114d82d68e6 100644
--- a/src/test/compile-fail/svh-change-type-ret.rs
+++ b/src/test/compile-fail/svh-change-type-ret.rs
@@ -15,7 +15,9 @@
 
 extern crate a;
 extern crate b; //~ ERROR: found possibly newer version of crate `a` which `b` depends on
-//~^ NOTE: perhaps this crate needs to be recompiled
+//~| NOTE: perhaps this crate needs to be recompiled
+//~| NOTE: crate `a` path #1:
+//~| NOTE: crate `b` path #1:
 
 fn main() {
     b::foo()
diff --git a/src/test/compile-fail/svh-change-type-static.rs b/src/test/compile-fail/svh-change-type-static.rs
index c42714609b6..80a9119095e 100644
--- a/src/test/compile-fail/svh-change-type-static.rs
+++ b/src/test/compile-fail/svh-change-type-static.rs
@@ -15,7 +15,9 @@
 
 extern crate a;
 extern crate b; //~ ERROR: found possibly newer version of crate `a` which `b` depends on
-//~^ NOTE: perhaps this crate needs to be recompiled
+//~| NOTE: perhaps this crate needs to be recompiled
+//~| NOTE: crate `a` path #1:
+//~| NOTE: crate `b` path #1:
 
 fn main() {
     b::foo()
diff --git a/src/test/compile-fail/svh-use-trait.rs b/src/test/compile-fail/svh-use-trait.rs
index 7fdbf35fc6d..c6c5b10bda3 100644
--- a/src/test/compile-fail/svh-use-trait.rs
+++ b/src/test/compile-fail/svh-use-trait.rs
@@ -20,7 +20,9 @@
 
 extern crate uta;
 extern crate utb; //~ ERROR: found possibly newer version of crate `uta` which `utb` depends
-//~^ NOTE: perhaps this crate needs to be recompiled
+//~| NOTE: perhaps this crate needs to be recompiled?
+//~| NOTE: crate `uta` path #1:
+//~| NOTE: crate `utb` path #1:
 
 fn main() {
     utb::foo()