---

yaml
---
r: 181755
b: refs/heads/master
c: 237ae45
h: refs/heads/master
i:
  181753: fb2c23f
  181751: 2f03305
v: v3

Author: Manishearth

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 99e39f4927408d25c8b9033f33738b672d870bb6
+refs/heads/master: 237ae450bf56a9740df114b95ae6d3c74fb7efd7
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 3cf3483ffd586b3042fda31c66d5afad7415e715
 refs/heads/try: ccf8fedf1cffcb8f6f3581d53d220039e192fe77

trunk/src/test/auxiliary/lint_stability.rs

@@ -64,16 +64,6 @@ impl MethodTester {
     pub fn method_stable(&self) {}
     #[stable(feature = "rust1", since = "1.0.0", reason = "text")]
     pub fn method_stable_text(&self) {}
-
-    #[locked]
-    pub fn method_locked(&self) {}
-    #[locked="text"]
-    pub fn method_locked_text(&self) {}
-
-    #[frozen]
-    pub fn method_frozen(&self) {}
-    #[frozen="text"]
-    pub fn method_frozen_text(&self) {}
 }
 
 #[stable(feature = "test_feature", since = "1.0.0")]
@@ -101,16 +91,6 @@ pub trait Trait {
     fn trait_stable(&self) {}
     #[stable(feature = "rust1", since = "1.0.0", reason = "text")]
     fn trait_stable_text(&self) {}
-
-    #[locked]
-    fn trait_locked(&self) {}
-    #[locked="text"]
-    fn trait_locked_text(&self) {}
-
-    #[frozen]
-    fn trait_frozen(&self) {}
-    #[frozen="text"]
-    fn trait_frozen_text(&self) {}
 }
 
 impl Trait for MethodTester {}