---

yaml
---
r: 159565
b: refs/heads/auto
c: 8352195
h: refs/heads/master
i:
  159563: 5662724
v: v3

Author: aturon

[refs]

@@ -10,7 +10,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: 5b895a833a6443046bbc8a6362b1a957cf68d1b4
+refs/heads/auto: 83521954267b3555bfb3a185a187b2c2d929e453
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/src/test/auxiliary/inherited_stability.rs

@@ -18,12 +18,20 @@ pub fn stable() {}
 
 #[stable]
 pub mod stable_mod {
-    #[experimental]
     pub fn experimental() {}
 
+    #[stable]
     pub fn stable() {}
 }
 
+#[unstable]
+pub mod unstable_mod {
+    #[experimental]
+    pub fn experimental() {}
+
+    pub fn unstable() {}
+}
+
 pub mod experimental_mod {
     pub fn experimental() {}
 
@@ -33,9 +41,9 @@ pub mod experimental_mod {
 
 #[stable]
 pub trait Stable {
-    #[experimental]
     fn experimental(&self);
 
+    #[stable]
     fn stable(&self);
 }
 

branches/auto/src/test/compile-fail/lint-stability.rs

@@ -165,6 +165,9 @@ mod inheritance {
         stable_mod::experimental(); //~ ERROR use of experimental item
         stable_mod::stable();
 
+        unstable_mod::experimental(); //~ ERROR use of experimental item
+        unstable_mod::unstable(); //~ ERROR use of unstable item
+
         experimental_mod::experimental(); //~ ERROR use of experimental item
         experimental_mod::stable();