---

yaml
---
r: 223260
b: refs/heads/beta
c: 5779fff
h: refs/heads/master
v: v3

Author: Gankra

[refs]

@@ -23,7 +23,7 @@ refs/tags/0.9: 36870b185fc5f5486636d4515f0e22677493f225
 refs/tags/0.10: ac33f2b15782272ae348dbd7b14b8257b2148b5a
 refs/tags/0.11.0: e1247cb1d0d681be034adb4b558b5a0c0d5720f9
 refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
-refs/heads/beta: 836cdf0a02f6dc308cf69020c3397e0247ac047f
+refs/heads/beta: 5779fff5436c13369d655b76b7d81aed534776dc
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
 refs/heads/tmp: 938f5d7af401e2d8238522fed4a612943b6e77fd
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f

branches/beta/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

branches/beta/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 };