From 91b1c5501f82f7d99cb73952183fd6cd3b87cb1b Mon Sep 17 00:00:00 2001
From: Ruud van Asseldonk <dev@veniogames.com>
Date: Tue, 5 May 2015 23:31:51 +0200
Subject: [PATCH] test: Wrap long expected compile-fail messages for E0282

---
 src/test/compile-fail/issue-12028.rs                           | 3 ++-
 src/test/compile-fail/issue-6458.rs                            | 3 ++-
 .../compile-fail/method-ambig-one-trait-unknown-int-type.rs    | 3 ++-
 .../compile-fail/traits-multidispatch-convert-ambig-dest.rs    | 3 ++-
 src/test/compile-fail/vector-no-ann.rs                         | 3 ++-
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/test/compile-fail/issue-12028.rs b/src/test/compile-fail/issue-12028.rs
index 99caa39b375b4..e1bfcd7b25df4 100644
--- a/src/test/compile-fail/issue-12028.rs
+++ b/src/test/compile-fail/issue-12028.rs
@@ -36,7 +36,8 @@ trait StreamHash<H: StreamHasher>: Hash<H> {
 impl<H: StreamHasher> Hash<H> for u8 {
     fn hash2(&self, hasher: &H) -> u64 {
         let mut stream = hasher.stream();
-        self.input_stream(&mut stream); //~ ERROR type annotations or generic parameter binding required
+        self.input_stream(&mut stream);
+        //~^ ERROR type annotations or generic parameter binding required
         Stream::result(&stream)
     }
 }
diff --git a/src/test/compile-fail/issue-6458.rs b/src/test/compile-fail/issue-6458.rs
index 9dd1502f71e72..c1f9dd6a4b893 100644
--- a/src/test/compile-fail/issue-6458.rs
+++ b/src/test/compile-fail/issue-6458.rs
@@ -16,7 +16,8 @@ pub struct MyState;
 pub fn foo<State>(_: TypeWithState<State>) {}
 
 pub fn bar() {
-   foo(TypeWithState(marker::PhantomData));  //~ ERROR type annotations or generic parameter binding required
+   foo(TypeWithState(marker::PhantomData));
+   //~^ ERROR type annotations or generic parameter binding required
 }
 
 fn main() {
diff --git a/src/test/compile-fail/method-ambig-one-trait-unknown-int-type.rs b/src/test/compile-fail/method-ambig-one-trait-unknown-int-type.rs
index e5e83810e6f97..59d75c5a787a6 100644
--- a/src/test/compile-fail/method-ambig-one-trait-unknown-int-type.rs
+++ b/src/test/compile-fail/method-ambig-one-trait-unknown-int-type.rs
@@ -31,7 +31,8 @@ impl foo for Vec<isize> {
 
 fn m1() {
     // we couldn't infer the type of the vector just based on calling foo()...
-    let mut x = Vec::new(); //~ ERROR type annotations or generic parameter binding required
+    let mut x = Vec::new();
+    //~^ ERROR type annotations or generic parameter binding required
     x.foo();
 }
 
diff --git a/src/test/compile-fail/traits-multidispatch-convert-ambig-dest.rs b/src/test/compile-fail/traits-multidispatch-convert-ambig-dest.rs
index 5936ced952f13..c77494912bc75 100644
--- a/src/test/compile-fail/traits-multidispatch-convert-ambig-dest.rs
+++ b/src/test/compile-fail/traits-multidispatch-convert-ambig-dest.rs
@@ -33,7 +33,8 @@ where T : Convert<U>
 }
 
 fn a() {
-    test(22, std::default::Default::default()); //~ ERROR type annotations or generic parameter binding required
+    test(22, std::default::Default::default());
+    //~^ ERROR type annotations or generic parameter binding required
 }
 
 fn main() {}
diff --git a/src/test/compile-fail/vector-no-ann.rs b/src/test/compile-fail/vector-no-ann.rs
index 3832c96cd16de..419b8c4e1b015 100644
--- a/src/test/compile-fail/vector-no-ann.rs
+++ b/src/test/compile-fail/vector-no-ann.rs
@@ -10,5 +10,6 @@
 
 
 fn main() {
-    let _foo = Vec::new(); //~ ERROR type annotations or generic parameter binding required
+    let _foo = Vec::new();
+    //~^ ERROR type annotations or generic parameter binding required
 }