diff options
| author | bors <bors@rust-lang.org> | 2018-03-06 15:01:21 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-03-06 15:01:21 +0000 |
| commit | 2789b067da2ac921b86199bde21dd231ace1da39 (patch) | |
| tree | d39a80c2778ced0f9437ade7f4e76ef51e364bfa /src/liballoc/binary_heap.rs | |
| parent | b977e044a7485a95852bfce12f1054bcc673355d (diff) | |
| parent | 8e3493d45924fdb869c37dcb992759f71defed7c (diff) | |
| download | rust-2789b067da2ac921b86199bde21dd231ace1da39.tar.gz rust-2789b067da2ac921b86199bde21dd231ace1da39.zip | |
Auto merge of #48768 - kennytm:rollup, r=kennytm
Rollup of 14 pull requests - Successful merges: #48403, #48432, #48546, #48573, #48590, #48657, #48727, #48732, #48753, #48754, #48761, #48474, #48507, #47463 - Failed merges:
Diffstat (limited to 'src/liballoc/binary_heap.rs')
| -rw-r--r-- | src/liballoc/binary_heap.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/liballoc/binary_heap.rs b/src/liballoc/binary_heap.rs index 3041f85cd4c..8aaac5d6e08 100644 --- a/src/liballoc/binary_heap.rs +++ b/src/liballoc/binary_heap.rs @@ -964,7 +964,7 @@ impl<'a, T> ExactSizeIterator for Iter<'a, T> { } } -#[unstable(feature = "fused", issue = "35602")] +#[stable(feature = "fused", since = "1.26.0")] impl<'a, T> FusedIterator for Iter<'a, T> {} /// An owning iterator over the elements of a `BinaryHeap`. @@ -1019,7 +1019,7 @@ impl<T> ExactSizeIterator for IntoIter<T> { } } -#[unstable(feature = "fused", issue = "35602")] +#[stable(feature = "fused", since = "1.26.0")] impl<T> FusedIterator for IntoIter<T> {} /// A draining iterator over the elements of a `BinaryHeap`. @@ -1065,7 +1065,7 @@ impl<'a, T: 'a> ExactSizeIterator for Drain<'a, T> { } } -#[unstable(feature = "fused", issue = "35602")] +#[stable(feature = "fused", since = "1.26.0")] impl<'a, T: 'a> FusedIterator for Drain<'a, T> {} #[stable(feature = "binary_heap_extras_15", since = "1.5.0")] |
