Skip to content

Commit 8e3493d

Browse files
kennytmkennytm
committed
Rollup merge of rust-lang#47463 - bluss:fused-iterator, r=alexcrichton
Stabilize FusedIterator FusedIterator is a marker trait that promises that the implementing iterator continues to return `None` from `.next()` once it has returned `None` once (and/or `.next_back()`, if implemented). The effects of FusedIterator are already widely available through `.fuse()`, but with stable `FusedIterator`, stable Rust users can implement this trait for their iterators when appropriate. Closes rust-lang#35602
2 parents ebc6d6e + c7c23fe commit 8e3493d

28 files changed

+109
-116
lines changed

‎src/liballoc/binary_heap.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -964,7 +964,7 @@ impl<'a, T> ExactSizeIterator for Iter<'a, T> {
964964
}
965965
}
966966

967-
#[unstable(feature = "fused", issue = "35602")]
967+
#[stable(feature = "fused", since = "1.26.0")]
968968
impl<'a, T> FusedIterator for Iter<'a, T> {}
969969

970970
/// An owning iterator over the elements of a `BinaryHeap`.
@@ -1019,7 +1019,7 @@ impl<T> ExactSizeIterator for IntoIter<T> {
10191019
}
10201020
}
10211021

1022-
#[unstable(feature = "fused", issue = "35602")]
1022+
#[stable(feature = "fused", since = "1.26.0")]
10231023
impl<T> FusedIterator for IntoIter<T> {}
10241024

10251025
/// A draining iterator over the elements of a `BinaryHeap`.
@@ -1065,7 +1065,7 @@ impl<'a, T: 'a> ExactSizeIterator for Drain<'a, T> {
10651065
}
10661066
}
10671067

1068-
#[unstable(feature = "fused", issue = "35602")]
1068+
#[stable(feature = "fused", since = "1.26.0")]
10691069
impl<'a, T: 'a> FusedIterator for Drain<'a, T> {}
10701070

10711071
#[stable(feature = "binary_heap_extras_15", since = "1.5.0")]

‎src/liballoc/boxed.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -722,7 +722,7 @@ impl<I: ExactSizeIterator + ?Sized> ExactSizeIterator for Box<I> {
722722
}
723723
}
724724

725-
#[unstable(feature = "fused", issue = "35602")]
725+
#[stable(feature = "fused", since = "1.26.0")]
726726
impl<I: FusedIterator + ?Sized> FusedIterator for Box<I> {}
727727

728728

‎src/liballoc/btree/map.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1156,7 +1156,7 @@ impl<'a, K: 'a, V: 'a> Iterator for Iter<'a, K, V> {
11561156
}
11571157
}
11581158

1159-
#[unstable(feature = "fused", issue = "35602")]
1159+
#[stable(feature = "fused", since = "1.26.0")]
11601160
impl<'a, K, V> FusedIterator for Iter<'a, K, V> {}
11611161

11621162
#[stable(feature = "rust1", since = "1.0.0")]
@@ -1235,7 +1235,7 @@ impl<'a, K: 'a, V: 'a> ExactSizeIterator for IterMut<'a, K, V> {
12351235
}
12361236
}
12371237

1238-
#[unstable(feature = "fused", issue = "35602")]
1238+
#[stable(feature = "fused", since = "1.26.0")]
12391239
impl<'a, K, V> FusedIterator for IterMut<'a, K, V> {}
12401240

12411241
#[stable(feature = "rust1", since = "1.0.0")]
@@ -1365,7 +1365,7 @@ impl<K, V> ExactSizeIterator for IntoIter<K, V> {
13651365
}
13661366
}
13671367

1368-
#[unstable(feature = "fused", issue = "35602")]
1368+
#[stable(feature = "fused", since = "1.26.0")]
13691369
impl<K, V> FusedIterator for IntoIter<K, V> {}
13701370

13711371
#[stable(feature = "rust1", since = "1.0.0")]
@@ -1395,7 +1395,7 @@ impl<'a, K, V> ExactSizeIterator for Keys<'a, K, V> {
13951395
}
13961396
}
13971397

1398-
#[unstable(feature = "fused", issue = "35602")]
1398+
#[stable(feature = "fused", since = "1.26.0")]
13991399
impl<'a, K, V> FusedIterator for Keys<'a, K, V> {}
14001400

14011401
#[stable(feature = "rust1", since = "1.0.0")]
@@ -1432,7 +1432,7 @@ impl<'a, K, V> ExactSizeIterator for Values<'a, K, V> {
14321432
}
14331433
}
14341434

1435-
#[unstable(feature = "fused", issue = "35602")]
1435+
#[stable(feature = "fused", since = "1.26.0")]
14361436
impl<'a, K, V> FusedIterator for Values<'a, K, V> {}
14371437

14381438
#[stable(feature = "rust1", since = "1.0.0")]
@@ -1482,7 +1482,7 @@ impl<'a, K, V> ExactSizeIterator for ValuesMut<'a, K, V> {
14821482
}
14831483
}
14841484

1485-
#[unstable(feature = "fused", issue = "35602")]
1485+
#[stable(feature = "fused", since = "1.26.0")]
14861486
impl<'a, K, V> FusedIterator for ValuesMut<'a, K, V> {}
14871487

14881488

@@ -1561,7 +1561,7 @@ impl<'a, K, V> Range<'a, K, V> {
15611561
}
15621562
}
15631563

1564-
#[unstable(feature = "fused", issue = "35602")]
1564+
#[stable(feature = "fused", since = "1.26.0")]
15651565
impl<'a, K, V> FusedIterator for Range<'a, K, V> {}
15661566

15671567
#[stable(feature = "btree_range", since = "1.17.0")]
@@ -1630,7 +1630,7 @@ impl<'a, K, V> DoubleEndedIterator for RangeMut<'a, K, V> {
16301630
}
16311631
}
16321632

1633-
#[unstable(feature = "fused", issue = "35602")]
1633+
#[stable(feature = "fused", since = "1.26.0")]
16341634
impl<'a, K, V> FusedIterator for RangeMut<'a, K, V> {}
16351635

16361636
impl<'a, K, V> RangeMut<'a, K, V> {

‎src/liballoc/btree/set.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -946,7 +946,7 @@ impl<'a, T> ExactSizeIterator for Iter<'a, T> {
946946
fn len(&self) -> usize { self.iter.len() }
947947
}
948948

949-
#[unstable(feature = "fused", issue = "35602")]
949+
#[stable(feature = "fused", since = "1.26.0")]
950950
impl<'a, T> FusedIterator for Iter<'a, T> {}
951951

952952
#[stable(feature = "rust1", since = "1.0.0")]
@@ -971,7 +971,7 @@ impl<T> ExactSizeIterator for IntoIter<T> {
971971
fn len(&self) -> usize { self.iter.len() }
972972
}
973973

974-
#[unstable(feature = "fused", issue = "35602")]
974+
#[stable(feature = "fused", since = "1.26.0")]
975975
impl<T> FusedIterator for IntoIter<T> {}
976976

977977
#[stable(feature = "btree_range", since = "1.17.0")]
@@ -997,7 +997,7 @@ impl<'a, T> DoubleEndedIterator for Range<'a, T> {
997997
}
998998
}
999999

1000-
#[unstable(feature = "fused", issue = "35602")]
1000+
#[stable(feature = "fused", since = "1.26.0")]
10011001
impl<'a, T> FusedIterator for Range<'a, T> {}
10021002

10031003
/// Compare `x` and `y`, but return `short` if x is None and `long` if y is None
@@ -1044,7 +1044,7 @@ impl<'a, T: Ord> Iterator for Difference<'a, T> {
10441044
}
10451045
}
10461046

1047-
#[unstable(feature = "fused", issue = "35602")]
1047+
#[stable(feature = "fused", since = "1.26.0")]
10481048
impl<'a, T: Ord> FusedIterator for Difference<'a, T> {}
10491049

10501050
#[stable(feature = "rust1", since = "1.0.0")]
@@ -1078,7 +1078,7 @@ impl<'a, T: Ord> Iterator for SymmetricDifference<'a, T> {
10781078
}
10791079
}
10801080

1081-
#[unstable(feature = "fused", issue = "35602")]
1081+
#[stable(feature = "fused", since = "1.26.0")]
10821082
impl<'a, T: Ord> FusedIterator for SymmetricDifference<'a, T> {}
10831083

10841084
#[stable(feature = "rust1", since = "1.0.0")]
@@ -1116,7 +1116,7 @@ impl<'a, T: Ord> Iterator for Intersection<'a, T> {
11161116
}
11171117
}
11181118

1119-
#[unstable(feature = "fused", issue = "35602")]
1119+
#[stable(feature = "fused", since = "1.26.0")]
11201120
impl<'a, T: Ord> FusedIterator for Intersection<'a, T> {}
11211121

11221122
#[stable(feature = "rust1", since = "1.0.0")]
@@ -1150,5 +1150,5 @@ impl<'a, T: Ord> Iterator for Union<'a, T> {
11501150
}
11511151
}
11521152

1153-
#[unstable(feature = "fused", issue = "35602")]
1153+
#[stable(feature = "fused", since = "1.26.0")]
11541154
impl<'a, T: Ord> FusedIterator for Union<'a, T> {}

‎src/liballoc/lib.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,6 @@
9696
#![feature(fmt_internals)]
9797
#![feature(from_ref)]
9898
#![feature(fundamental)]
99-
#![feature(fused)]
10099
#![feature(generic_param_attrs)]
101100
#![feature(i128_type)]
102101
#![feature(inclusive_range)]
@@ -126,7 +125,7 @@
126125
#![feature(exact_chunks)]
127126
#![feature(pointer_methods)]
128127

129-
#![cfg_attr(not(test), feature(fused, fn_traits, placement_new_protocol, swap_with_slice, i128))]
128+
#![cfg_attr(not(test), feature(fn_traits, placement_new_protocol, swap_with_slice, i128))]
130129
#![cfg_attr(test, feature(test, box_heap))]
131130

132131
// Allow testing this library

‎src/liballoc/linked_list.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -897,7 +897,7 @@ impl<'a, T> DoubleEndedIterator for Iter<'a, T> {
897897
#[stable(feature = "rust1", since = "1.0.0")]
898898
impl<'a, T> ExactSizeIterator for Iter<'a, T> {}
899899

900-
#[unstable(feature = "fused", issue = "35602")]
900+
#[stable(feature = "fused", since = "1.26.0")]
901901
impl<'a, T> FusedIterator for Iter<'a, T> {}
902902

903903
#[stable(feature = "rust1", since = "1.0.0")]
@@ -946,7 +946,7 @@ impl<'a, T> DoubleEndedIterator for IterMut<'a, T> {
946946
#[stable(feature = "rust1", since = "1.0.0")]
947947
impl<'a, T> ExactSizeIterator for IterMut<'a, T> {}
948948

949-
#[unstable(feature = "fused", issue = "35602")]
949+
#[stable(feature = "fused", since = "1.26.0")]
950950
impl<'a, T> FusedIterator for IterMut<'a, T> {}
951951

952952
impl<'a, T> IterMut<'a, T> {
@@ -1117,7 +1117,7 @@ impl<T> DoubleEndedIterator for IntoIter<T> {
11171117
#[stable(feature = "rust1", since = "1.0.0")]
11181118
impl<T> ExactSizeIterator for IntoIter<T> {}
11191119

1120-
#[unstable(feature = "fused", issue = "35602")]
1120+
#[stable(feature = "fused", since = "1.26.0")]
11211121
impl<T> FusedIterator for IntoIter<T> {}
11221122

11231123
#[stable(feature = "rust1", since = "1.0.0")]

‎src/liballoc/str.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ impl<'a> Iterator for EncodeUtf16<'a> {
172172
}
173173
}
174174

175-
#[unstable(feature = "fused", issue = "35602")]
175+
#[stable(feature = "fused", since = "1.26.0")]
176176
impl<'a> FusedIterator for EncodeUtf16<'a> {}
177177

178178
#[stable(feature = "rust1", since = "1.0.0")]

‎src/liballoc/string.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2254,5 +2254,5 @@ impl<'a> DoubleEndedIterator for Drain<'a> {
22542254
}
22552255
}
22562256

2257-
#[unstable(feature = "fused", issue = "35602")]
2257+
#[stable(feature = "fused", since = "1.26.0")]
22582258
impl<'a> FusedIterator for Drain<'a> {}

‎src/liballoc/vec.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2273,7 +2273,7 @@ impl<T> ExactSizeIterator for IntoIter<T> {
22732273
}
22742274
}
22752275

2276-
#[unstable(feature = "fused", issue = "35602")]
2276+
#[stable(feature = "fused", since = "1.26.0")]
22772277
impl<T> FusedIterator for IntoIter<T> {}
22782278

22792279
#[unstable(feature = "trusted_len", issue = "37572")]
@@ -2379,7 +2379,7 @@ impl<'a, T> ExactSizeIterator for Drain<'a, T> {
23792379
}
23802380
}
23812381

2382-
#[unstable(feature = "fused", issue = "35602")]
2382+
#[stable(feature = "fused", since = "1.26.0")]
23832383
impl<'a, T> FusedIterator for Drain<'a, T> {}
23842384

23852385
/// A place for insertion at the back of a `Vec`.

‎src/liballoc/vec_deque.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1991,7 +1991,7 @@ impl<'a, T> ExactSizeIterator for Iter<'a, T> {
19911991
}
19921992
}
19931993

1994-
#[unstable(feature = "fused", issue = "35602")]
1994+
#[stable(feature = "fused", since = "1.26.0")]
19951995
impl<'a, T> FusedIterator for Iter<'a, T> {}
19961996

19971997

@@ -2084,7 +2084,7 @@ impl<'a, T> ExactSizeIterator for IterMut<'a, T> {
20842084
}
20852085
}
20862086

2087-
#[unstable(feature = "fused", issue = "35602")]
2087+
#[stable(feature = "fused", since = "1.26.0")]
20882088
impl<'a, T> FusedIterator for IterMut<'a, T> {}
20892089

20902090
/// An owning iterator over the elements of a `VecDeque`.
@@ -2140,7 +2140,7 @@ impl<T> ExactSizeIterator for IntoIter<T> {
21402140
}
21412141
}
21422142

2143-
#[unstable(feature = "fused", issue = "35602")]
2143+
#[stable(feature = "fused", since = "1.26.0")]
21442144
impl<T> FusedIterator for IntoIter<T> {}
21452145

21462146
/// A draining iterator over the elements of a `VecDeque`.
@@ -2247,7 +2247,7 @@ impl<'a, T: 'a> DoubleEndedIterator for Drain<'a, T> {
22472247
#[stable(feature = "drain", since = "1.6.0")]
22482248
impl<'a, T: 'a> ExactSizeIterator for Drain<'a, T> {}
22492249

2250-
#[unstable(feature = "fused", issue = "35602")]
2250+
#[stable(feature = "fused", since = "1.26.0")]
22512251
impl<'a, T: 'a> FusedIterator for Drain<'a, T> {}
22522252

22532253
#[stable(feature = "rust1", since = "1.0.0")]

‎src/libcore/char.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -643,7 +643,7 @@ impl ExactSizeIterator for EscapeUnicode {
643643
}
644644
}
645645

646-
#[unstable(feature = "fused", issue = "35602")]
646+
#[stable(feature = "fused", since = "1.26.0")]
647647
impl FusedIterator for EscapeUnicode {}
648648

649649
#[stable(feature = "char_struct_display", since = "1.16.0")]
@@ -756,7 +756,7 @@ impl ExactSizeIterator for EscapeDefault {
756756
}
757757
}
758758

759-
#[unstable(feature = "fused", issue = "35602")]
759+
#[stable(feature = "fused", since = "1.26.0")]
760760
impl FusedIterator for EscapeDefault {}
761761

762762
#[stable(feature = "char_struct_display", since = "1.16.0")]
@@ -790,7 +790,7 @@ impl Iterator for EscapeDebug {
790790
#[stable(feature = "char_escape_debug", since = "1.20.0")]
791791
impl ExactSizeIterator for EscapeDebug { }
792792

793-
#[unstable(feature = "fused", issue = "35602")]
793+
#[stable(feature = "fused", since = "1.26.0")]
794794
impl FusedIterator for EscapeDebug {}
795795

796796
#[stable(feature = "char_escape_debug", since = "1.20.0")]
@@ -904,5 +904,5 @@ impl<I: Iterator<Item = u8>> Iterator for DecodeUtf8<I> {
904904
}
905905
}
906906

907-
#[unstable(feature = "fused", issue = "35602")]
907+
#[unstable(feature = "decode_utf8", issue = "33906")]
908908
impl<I: FusedIterator<Item = u8>> FusedIterator for DecodeUtf8<I> {}

0 commit comments

Comments
 (0)