diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2017-03-15 07:58:27 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2017-03-17 13:28:53 -0700 |
| commit | 1241a88fa9ddf5e645d1e6e93e04c435bbf15cd4 (patch) | |
| tree | 987da130316d1be22082895a02b1adb6cb35e677 /src/libcollections | |
| parent | a8f4a1bd984091ffb8f87f9440e2483f94b44a20 (diff) | |
| download | rust-1241a88fa9ddf5e645d1e6e93e04c435bbf15cd4.tar.gz rust-1241a88fa9ddf5e645d1e6e93e04c435bbf15cd4.zip | |
Minor fixups to fix tidy errors
Diffstat (limited to 'src/libcollections')
| -rw-r--r-- | src/libcollections/btree/map.rs | 2 | ||||
| -rw-r--r-- | src/libcollections/btree/set.rs | 7 | ||||
| -rw-r--r-- | src/libcollections/range.rs | 2 |
3 files changed, 4 insertions, 7 deletions
diff --git a/src/libcollections/btree/map.rs b/src/libcollections/btree/map.rs index a746175a5e9..53fe6b4bc9f 100644 --- a/src/libcollections/btree/map.rs +++ b/src/libcollections/btree/map.rs @@ -338,6 +338,7 @@ pub struct ValuesMut<'a, K: 'a, V: 'a> { } /// An iterator over a sub-range of BTreeMap's entries. +#[stable(feature = "btree_range", since = "1.17.0")] pub struct Range<'a, K: 'a, V: 'a> { front: Handle<NodeRef<marker::Immut<'a>, K, V, marker::Leaf>, marker::Edge>, back: Handle<NodeRef<marker::Immut<'a>, K, V, marker::Leaf>, marker::Edge>, @@ -351,6 +352,7 @@ impl<'a, K: 'a + fmt::Debug, V: 'a + fmt::Debug> fmt::Debug for Range<'a, K, V> } /// A mutable iterator over a sub-range of BTreeMap's entries. +#[stable(feature = "btree_range", since = "1.17.0")] pub struct RangeMut<'a, K: 'a, V: 'a> { front: Handle<NodeRef<marker::Mut<'a>, K, V, marker::Leaf>, marker::Edge>, back: Handle<NodeRef<marker::Mut<'a>, K, V, marker::Leaf>, marker::Edge>, diff --git a/src/libcollections/btree/set.rs b/src/libcollections/btree/set.rs index e3c990c80de..72d25f87bca 100644 --- a/src/libcollections/btree/set.rs +++ b/src/libcollections/btree/set.rs @@ -113,6 +113,7 @@ pub struct IntoIter<T> { /// [`BTreeSet`]: struct.BTreeSet.html /// [`range`]: struct.BTreeSet.html#method.range #[derive(Debug)] +#[stable(feature = "btree_range", since = "1.17.0")] pub struct Range<'a, T: 'a> { iter: ::btree_map::Range<'a, T, ()>, } @@ -264,8 +265,6 @@ impl<T: Ord> BTreeSet<T> { /// # Examples /// /// ``` - /// #![feature(btree_range, collections_bound)] - /// /// use std::collections::BTreeSet; /// use std::collections::Bound::Included; /// @@ -278,9 +277,7 @@ impl<T: Ord> BTreeSet<T> { /// } /// assert_eq!(Some(&5), set.range(4..).next()); /// ``` - #[unstable(feature = "btree_range", - reason = "matches collection reform specification, waiting for dust to settle", - issue = "27787")] + #[stable(feature = "btree_range", since = "1.17.0")] pub fn range<K: ?Sized, R>(&self, range: R) -> Range<T> where K: Ord, T: Borrow<K>, R: RangeArgument<K> { diff --git a/src/libcollections/range.rs b/src/libcollections/range.rs index e4b94a1d70e..31e4d001397 100644 --- a/src/libcollections/range.rs +++ b/src/libcollections/range.rs @@ -29,7 +29,6 @@ pub trait RangeArgument<T: ?Sized> { /// ``` /// #![feature(collections)] /// #![feature(collections_range)] - /// #![feature(collections_bound)] /// /// extern crate collections; /// @@ -52,7 +51,6 @@ pub trait RangeArgument<T: ?Sized> { /// ``` /// #![feature(collections)] /// #![feature(collections_range)] - /// #![feature(collections_bound)] /// /// extern crate collections; /// |