From b44cb01bd73b32ffe046b4dcfa549a954d139ab2 Mon Sep 17 00:00:00 2001
From: Vadim Petrochenkov <vadim.petrochenkov@gmail.com>
Date: Sat, 19 Sep 2015 12:16:30 +0300
Subject: [PATCH] Don't use std in stability tests

---
 src/test/compile-fail/issue-28075.rs   | 10 +++++++---
 src/test/compile-fail/issue-28388-3.rs |  8 ++++++--
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/test/compile-fail/issue-28075.rs b/src/test/compile-fail/issue-28075.rs
index 7e9dfcf3ccb..d75f5f606a0 100644
--- a/src/test/compile-fail/issue-28075.rs
+++ b/src/test/compile-fail/issue-28075.rs
@@ -10,12 +10,16 @@
 
 // Unstable entities should be caught in import lists
 
+// aux-build:lint_stability.rs
+
 #![allow(unused_imports)]
 
-use std::thread::{catch_panic, ScopedKey}; //~ ERROR use of unstable library feature 'catch_panic'
-//~^ ERROR use of unstable library feature 'scoped_tls'
+extern crate lint_stability;
 
-use std::rt::{self}; //~ ERROR use of unstable library feature 'rt'
+use lint_stability::{unstable, deprecated}; //~ ERROR use of unstable library feature 'test_feature'
+//~^ WARNING use of deprecated item
+
+use lint_stability::unstable::{self as u}; //~ ERROR use of unstable library feature 'test_feature'
 
 fn main() {
 }
diff --git a/src/test/compile-fail/issue-28388-3.rs b/src/test/compile-fail/issue-28388-3.rs
index 59756be55bd..0cb669f5f8f 100644
--- a/src/test/compile-fail/issue-28388-3.rs
+++ b/src/test/compile-fail/issue-28388-3.rs
@@ -10,7 +10,11 @@
 
 // Prefix in imports with empty braces should be resolved and checked privacy, stability, etc.
 
-use std::rt::{}; //~ ERROR use of unstable library feature 'rt'
-use std::{}; // OK
+// aux-build:lint_stability.rs
+
+extern crate lint_stability;
+
+use lint_stability::UnstableStruct::{}; //~ ERROR use of unstable library feature 'test_feature'
+use lint_stability::StableStruct::{}; // OK
 
 fn main() {}