diff options
| author | Brian Anderson <banderson@mozilla.com> | 2015-01-22 12:33:46 -0800 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2015-01-23 15:50:03 -0800 |
| commit | 9758c488a94e77cc8a110a6783a99cf5b91326db (patch) | |
| tree | ca5f2436cb4b9dc39aa7f525cf4a5fc9288d0ac7 /src/libcollections | |
| parent | cd6d9eab5d75584edfcae4ffdef8b0836db80c1e (diff) | |
| download | rust-9758c488a94e77cc8a110a6783a99cf5b91326db.tar.gz rust-9758c488a94e77cc8a110a6783a99cf5b91326db.zip | |
Deprecated attributes don't take 'feature' names and are paired with stable/unstable
Conflicts: src/libcore/atomic.rs src/libcore/finally.rs src/test/auxiliary/inherited_stability.rs src/test/auxiliary/lint_stability.rs
Diffstat (limited to 'src/libcollections')
| -rw-r--r-- | src/libcollections/lib.rs | 1 | ||||
| -rw-r--r-- | src/libcollections/slice.rs | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/libcollections/lib.rs b/src/libcollections/lib.rs index b836fe61a75..b5725e63327 100644 --- a/src/libcollections/lib.rs +++ b/src/libcollections/lib.rs @@ -33,6 +33,7 @@ #![feature(alloc)] #![feature(unicode)] #![feature(hash)] +#![cfg_attr(test, feature(test))] #[macro_use] extern crate core; diff --git a/src/libcollections/slice.rs b/src/libcollections/slice.rs index 6765eda4cb7..869b8539494 100644 --- a/src/libcollections/slice.rs +++ b/src/libcollections/slice.rs @@ -642,7 +642,8 @@ pub trait SliceExt { fn binary_search(&self, x: &Self::Item) -> Result<uint, uint> where Self::Item: Ord; /// Deprecated: use `binary_search` instead. - #[deprecated(feature = "oldstuff", since = "1.0.0", reason = "use binary_search instead")] + #[unstable(feature = "collections")] + #[deprecated(since = "1.0.0", reason = "use binary_search instead")] fn binary_search_elem(&self, x: &Self::Item) -> Result<uint, uint> where Self::Item: Ord { self.binary_search(x) } |