Update tests for new stability inheritance rules

2 files changed, 13 insertions, 2 deletions

diff --git a/src/test/auxiliary/inherited_stability.rs b/src/test/auxiliary/inherited_stability.rs
index 4016a76206b..5691ce3bfa7 100644
--- a/src/test/auxiliary/inherited_stability.rs
+++ b/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);
 }
 
diff --git a/src/test/compile-fail/lint-stability.rs b/src/test/compile-fail/lint-stability.rs
index 483a3b6d667..ba8559c8008 100644
--- a/src/test/compile-fail/lint-stability.rs
+++ b/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();