From 5779fff5436c13369d655b76b7d81aed534776dc Mon Sep 17 00:00:00 2001
From: Alexis Beingessner <a.beingessner@gmail.com>
Date: Sat, 6 Jun 2015 17:14:46 -0700
Subject: [PATCH] update stability compile-fail tests

---
 .../compile-fail/lint-stability-fields.rs     | 35 ++++++++++++++++---
 src/test/compile-fail/lint-stability.rs       | 12 +++++--
 2 files changed, 39 insertions(+), 8 deletions(-)

diff --git a/src/test/compile-fail/lint-stability-fields.rs b/src/test/compile-fail/lint-stability-fields.rs
index 716d7674b2dd..db58f930a02b 100644
--- a/src/test/compile-fail/lint-stability-fields.rs
+++ b/src/test/compile-fail/lint-stability-fields.rs
@@ -116,14 +116,20 @@ mod cross_crate {
             //~^ ERROR use of deprecated item
             //~^^ ERROR use of unstable
             override1: 2,
-            override2: 3, //~ ERROR use of unstable
+            //~^ ERROR use of deprecated item
+            override2: 3,
+            //~^ ERROR use of deprecated item
+            //~^^ ERROR use of unstable
         };
 
         let _ = x.inherit;
         //~^ ERROR use of deprecated item
         //~^^ ERROR use of unstable
         let _ = x.override1;
-        let _ = x.override2; //~ ERROR use of unstable
+        //~^ ERROR use of deprecated item
+        let _ = x.override2;
+        //~^ ERROR use of deprecated item
+        //~^^ ERROR use of unstable
 
         let Deprecated {
             //~^ ERROR use of deprecated item
@@ -132,7 +138,10 @@ mod cross_crate {
             //~^ ERROR use of deprecated item
             //~^^ ERROR use of unstable
             override1: _,
-            override2: _ //~ ERROR use of unstable
+            //~^ ERROR use of deprecated item
+            override2: _
+            //~^ ERROR use of unstable
+            //~^^ ERROR use of deprecated item
         } = x;
 
         let Deprecated
@@ -149,7 +158,10 @@ mod cross_crate {
         //~^ ERROR use of deprecated item
         //~^^ ERROR use of unstable
         let _ = x.1;
-        let _ = x.2; //~ ERROR use of unstable
+        //~^ ERROR use of deprecated item
+        let _ = x.2;
+        //~^ ERROR use of deprecated item
+        //~^^ ERROR use of unstable
 
         let Deprecated2
         //~^ ERROR use of deprecated item
@@ -158,7 +170,10 @@ mod cross_crate {
              //~^ ERROR use of deprecated item
              //~^^ ERROR use of unstable
              _,
-             _) //~ ERROR use of unstable
+             //~^ ERROR use of deprecated item
+             _)
+             //~^ ERROR use of deprecated item
+             //~^^ ERROR use of unstable
             = x;
         let Deprecated2
         //~^ ERROR use of deprecated item
@@ -300,20 +315,26 @@ mod this_crate {
             inherit: 1,
             //~^ ERROR use of deprecated item
             override1: 2,
+            //~^ ERROR use of deprecated item
             override2: 3,
+            //~^ ERROR use of deprecated item
         };
 
         let _ = x.inherit;
         //~^ ERROR use of deprecated item
         let _ = x.override1;
+        //~^ ERROR use of deprecated item
         let _ = x.override2;
+        //~^ ERROR use of deprecated item
 
         let Deprecated {
             //~^ ERROR use of deprecated item
             inherit: _,
             //~^ ERROR use of deprecated item
             override1: _,
+            //~^ ERROR use of deprecated item
             override2: _
+            //~^ ERROR use of deprecated item
         } = x;
 
         let Deprecated
@@ -327,14 +348,18 @@ mod this_crate {
         let _ = x.0;
         //~^ ERROR use of deprecated item
         let _ = x.1;
+        //~^ ERROR use of deprecated item
         let _ = x.2;
+        //~^ ERROR use of deprecated item
 
         let Deprecated2
         //~^ ERROR use of deprecated item
             (_,
              //~^ ERROR use of deprecated item
              _,
+             //~^ ERROR use of deprecated item
              _)
+            //~^ ERROR use of deprecated item
             = x;
         let Deprecated2
         //~^ ERROR use of deprecated item
diff --git a/src/test/compile-fail/lint-stability.rs b/src/test/compile-fail/lint-stability.rs
index 16f195b4ea26..4cba12d7b352 100644
--- a/src/test/compile-fail/lint-stability.rs
+++ b/src/test/compile-fail/lint-stability.rs
@@ -128,8 +128,11 @@ mod cross_crate {
         <Foo as Trait>::trait_stable_text(&foo);
 
         let _ = DeprecatedStruct { i: 0 }; //~ ERROR use of deprecated item
-        let _ = DeprecatedUnstableStruct { i: 0 }; //~ ERROR use of deprecated item
-        //~^ ERROR use of unstable library feature
+        let _ = DeprecatedUnstableStruct {
+            //~^ ERROR use of deprecated item
+            //~^^ ERROR use of unstable library feature
+            i: 0 //~ ERROR use of deprecated item
+        };
         let _ = UnstableStruct { i: 0 }; //~ ERROR use of unstable library feature
         let _ = StableStruct { i: 0 };
 
@@ -417,7 +420,10 @@ mod this_crate {
         <Foo>::trait_stable_text(&foo);
         <Foo as Trait>::trait_stable_text(&foo);
 
-        let _ = DeprecatedStruct { i: 0 }; //~ ERROR use of deprecated item
+        let _ = DeprecatedStruct {
+            //~^ ERROR use of deprecated item
+            i: 0 //~ ERROR use of deprecated item
+        };
         let _ = UnstableStruct { i: 0 };
         let _ = StableStruct { i: 0 };