From 6ce9ac4b3c7fb9699532973785e3144d693912c8 Mon Sep 17 00:00:00 2001
From: Florian Hahn <flo@fhahn.com>
Date: Thu, 7 Jan 2016 11:56:24 +0100
Subject: [PATCH] Fix tests that used `// | help:` annotations

---
 .../augmented-assignments-feature-gate-cross.rs     |  2 +-
 .../augmented-assignments-feature-gate.rs           |  2 +-
 .../issue-21659-show-relevant-trait-impls-1.rs      |  7 ++++---
 .../issue-21659-show-relevant-trait-impls-2.rs      | 13 +++++++------
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/test/compile-fail/augmented-assignments-feature-gate-cross.rs b/src/test/compile-fail/augmented-assignments-feature-gate-cross.rs
index c26d6cf4fe6d7..d4a9830f220ea 100644
--- a/src/test/compile-fail/augmented-assignments-feature-gate-cross.rs
+++ b/src/test/compile-fail/augmented-assignments-feature-gate-cross.rs
@@ -21,5 +21,5 @@ fn main() {
     let mut x = Int(0);
     x += 1;
     //~^ error: overloaded augmented assignments are not stable
-    // | help: add #![feature(augmented_assignments)] to the crate root to enable
+    //~| help: add #![feature(augmented_assignments)] to the crate root to enable
 }
diff --git a/src/test/compile-fail/augmented-assignments-feature-gate.rs b/src/test/compile-fail/augmented-assignments-feature-gate.rs
index 0db8f9858f9db..6f9e9cf945a54 100644
--- a/src/test/compile-fail/augmented-assignments-feature-gate.rs
+++ b/src/test/compile-fail/augmented-assignments-feature-gate.rs
@@ -22,5 +22,5 @@ fn main() {
     let mut x = Int(0);
     x += 1;
     //~^ error: overloaded augmented assignments are not stable
-    // | help: add #![feature(augmented_assignments)] to the crate root to enable
+    //~| help: add #![feature(augmented_assignments)] to the crate root to enable
 }
diff --git a/src/test/compile-fail/issue-21659-show-relevant-trait-impls-1.rs b/src/test/compile-fail/issue-21659-show-relevant-trait-impls-1.rs
index 416eef4ad258f..8ea63fdf1762d 100644
--- a/src/test/compile-fail/issue-21659-show-relevant-trait-impls-1.rs
+++ b/src/test/compile-fail/issue-21659-show-relevant-trait-impls-1.rs
@@ -33,7 +33,8 @@ fn main() {
 
     f1.foo(1usize);
     //~^ error: the trait `Foo<usize>` is not implemented for the type `Bar`
-    // | help: the following implementations were found:
-    // | help: implementation 1: `Foo<i32>`
-    // | help: implementation 2: `Foo<u8>`
+    //~| help: the following implementations were found:
+    //~| help:   <Bar as Foo<i32>>
+    //~| help:   <Bar as Foo<u8>>
+    //~| help: run `rustc --explain E0277`
 }
diff --git a/src/test/compile-fail/issue-21659-show-relevant-trait-impls-2.rs b/src/test/compile-fail/issue-21659-show-relevant-trait-impls-2.rs
index 07a7c98dd7ff6..9460ac19596e1 100644
--- a/src/test/compile-fail/issue-21659-show-relevant-trait-impls-2.rs
+++ b/src/test/compile-fail/issue-21659-show-relevant-trait-impls-2.rs
@@ -37,10 +37,11 @@ fn main() {
 
     f1.foo(1usize);
     //~^ error: the trait `Foo<usize>` is not implemented for the type `Bar`
-    // | help: the following implementations were found:
-    // | help:   Foo<i8>
-    // | help:   Foo<i16>
-    // | help:   Foo<i32>
-    // | help:   Foo<u8>
-    // | help: and 2 others
+    //~| help: the following implementations were found:
+    //~| help:   <Bar as Foo<i8>>
+    //~| help:   <Bar as Foo<i16>>
+    //~| help:   <Bar as Foo<i32>>
+    //~| help:   <Bar as Foo<u8>>
+    //~| help: and 2 others
+    //~| help: run `rustc --explain E0277`
 }