Add NOTE test annotations

10 files changed, 14 insertions, 5 deletions

diff --git a/src/test/compile-fail/issue-25385.rs b/src/test/compile-fail/issue-25385.rs
index aa941bc5691..4aacb6840e9 100644
--- a/src/test/compile-fail/issue-25385.rs
+++ b/src/test/compile-fail/issue-25385.rs
@@ -17,6 +17,7 @@ macro_rules! foo {
 fn main() {
     let a = 1i32;
     foo!(a);
+    //~^ NOTE in this expansion of foo!
 
     foo!(1i32.foo());
     //~^ ERROR no method named `foo` found for type `i32` in the current scope
diff --git a/src/test/compile-fail/issue-25386.rs b/src/test/compile-fail/issue-25386.rs
index b2775db5e75..297d3aacfd5 100644
--- a/src/test/compile-fail/issue-25386.rs
+++ b/src/test/compile-fail/issue-25386.rs
@@ -35,4 +35,6 @@ macro_rules! check_ptr_exist {
 fn main() {
     let item = stuff::Item::new();
     println!("{}", check_ptr_exist!(item, name));
+    //~^ NOTE in this expansion of check_ptr_exist!
+    //~^^ NOTE in this expansion of check_ptr_exist!
 }
diff --git a/src/test/compile-fail/issue-25793.rs b/src/test/compile-fail/issue-25793.rs
index e4199fcc126..fd3e3186bc5 100644
--- a/src/test/compile-fail/issue-25793.rs
+++ b/src/test/compile-fail/issue-25793.rs
@@ -26,9 +26,8 @@ impl HasInfo {
 
     fn get_other(&mut self) -> usize {
         self.get_size(width!(self))
+        //~^ NOTE in this expansion of width!
     }
 }
 
-fn main() {
-    println!("hello?");
-}
+fn main() {}
diff --git a/src/test/compile-fail/issue-26093.rs b/src/test/compile-fail/issue-26093.rs
index 3489a2ca9be..2f43388b7af 100644
--- a/src/test/compile-fail/issue-26093.rs
+++ b/src/test/compile-fail/issue-26093.rs
@@ -17,4 +17,5 @@ macro_rules! not_an_lvalue {
 
 fn main() {
     not_an_lvalue!(99);
+    //~^ NOTE in this expansion of not_an_lvalue!
 }
diff --git a/src/test/compile-fail/issue-26094.rs b/src/test/compile-fail/issue-26094.rs
index 8b4ac7ddab9..99add95e806 100644
--- a/src/test/compile-fail/issue-26094.rs
+++ b/src/test/compile-fail/issue-26094.rs
@@ -15,9 +15,9 @@ macro_rules! some_macro {
     })
 }
 
-fn some_function() {
-}
+fn some_function() {}
 
 fn main() {
     some_macro!(some_function);
+    //~^ in this expansion of some_macro!
 }
diff --git a/src/test/compile-fail/issue-26237.rs b/src/test/compile-fail/issue-26237.rs
index 1cfece0d0b7..11e236d2212 100644
--- a/src/test/compile-fail/issue-26237.rs
+++ b/src/test/compile-fail/issue-26237.rs
@@ -19,4 +19,5 @@ fn main() {
     let mut value_a = 0;
     let mut value_b = 0;
     macro_panic!(value_a, value_b);
+    //~^ in this expansion of macro_panic!
 }
diff --git a/src/test/compile-fail/issue-26480.rs b/src/test/compile-fail/issue-26480.rs
index 66bb0de13c4..903df42291c 100644
--- a/src/test/compile-fail/issue-26480.rs
+++ b/src/test/compile-fail/issue-26480.rs
@@ -37,6 +37,8 @@ macro_rules! cast {
 fn main() {
     let hello = ['H', 'e', 'y'];
     write!(hello);
+    //~^ NOTE in this expansion of write!
 
     cast!(2);
+    //~^ NOTE in this expansion of cast!
 }
diff --git a/src/test/compile-fail/issue-28308.rs b/src/test/compile-fail/issue-28308.rs
index 642bb0c4a10..b0c44b5f33a 100644
--- a/src/test/compile-fail/issue-28308.rs
+++ b/src/test/compile-fail/issue-28308.rs
@@ -10,6 +10,7 @@
 
 // this error is dispayed in `<std macros>`
 // error-pattern:cannot apply unary operator `!` to type `&'static str`
+// error-pattern:in this expansion of assert!
 
 fn main() {
     assert!("foo");
diff --git a/src/test/compile-fail/issue-29084.rs b/src/test/compile-fail/issue-29084.rs
index a9f36431120..78913e759a1 100644
--- a/src/test/compile-fail/issue-29084.rs
+++ b/src/test/compile-fail/issue-29084.rs
@@ -18,4 +18,5 @@ macro_rules! foo {
 
 fn main() {
     foo!(0u8);
+    //~^ NOTE in this expansion of foo!
 }
diff --git a/src/test/compile-fail/issue-31011.rs b/src/test/compile-fail/issue-31011.rs
index a55b6f13872..b828b11030d 100644
--- a/src/test/compile-fail/issue-31011.rs
+++ b/src/test/compile-fail/issue-31011.rs
@@ -26,6 +26,7 @@ struct Foo {
 fn wrap<T>(context: &T) -> ()
 {
     log!(context, "entered wrapper");
+    //~^ in this expansion of log!
 }
 
 fn main() {