Skip to content

Commit b9a51ce

Browse files
Rollup merge of #53396 - matklad:fix-flatten-since, r=varkor
Fix since of Iterator::flatten to be a proper semver r? @kennytm
2 parents 7acfa86 + 1a0d3f0 commit b9a51ce

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

src/libcore/iter/iterator.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1110,7 +1110,7 @@ pub trait Iterator {
11101110
///
11111111
/// [`flat_map()`]: #method.flat_map
11121112
#[inline]
1113-
#[stable(feature = "iterator_flatten", since = "1.29")]
1113+
#[stable(feature = "iterator_flatten", since = "1.29.0")]
11141114
fn flatten(self) -> Flatten<Self>
11151115
where Self: Sized, Self::Item: IntoIterator {
11161116
Flatten { inner: flatten_compat(self) }

src/libcore/iter/mod.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -2577,13 +2577,13 @@ impl<I, U, F> FusedIterator for FlatMap<I, U, F>
25772577
/// [`flatten`]: trait.Iterator.html#method.flatten
25782578
/// [`Iterator`]: trait.Iterator.html
25792579
#[must_use = "iterator adaptors are lazy and do nothing unless consumed"]
2580-
#[stable(feature = "iterator_flatten", since = "1.29")]
2580+
#[stable(feature = "iterator_flatten", since = "1.29.0")]
25812581
pub struct Flatten<I: Iterator>
25822582
where I::Item: IntoIterator {
25832583
inner: FlattenCompat<I, <I::Item as IntoIterator>::IntoIter>,
25842584
}
25852585

2586-
#[stable(feature = "iterator_flatten", since = "1.29")]
2586+
#[stable(feature = "iterator_flatten", since = "1.29.0")]
25872587
impl<I, U> fmt::Debug for Flatten<I>
25882588
where I: Iterator + fmt::Debug, U: Iterator + fmt::Debug,
25892589
I::Item: IntoIterator<IntoIter = U, Item = U::Item>,
@@ -2593,15 +2593,15 @@ impl<I, U> fmt::Debug for Flatten<I>
25932593
}
25942594
}
25952595

2596-
#[stable(feature = "iterator_flatten", since = "1.29")]
2596+
#[stable(feature = "iterator_flatten", since = "1.29.0")]
25972597
impl<I, U> Clone for Flatten<I>
25982598
where I: Iterator + Clone, U: Iterator + Clone,
25992599
I::Item: IntoIterator<IntoIter = U, Item = U::Item>,
26002600
{
26012601
fn clone(&self) -> Self { Flatten { inner: self.inner.clone() } }
26022602
}
26032603

2604-
#[stable(feature = "iterator_flatten", since = "1.29")]
2604+
#[stable(feature = "iterator_flatten", since = "1.29.0")]
26052605
impl<I, U> Iterator for Flatten<I>
26062606
where I: Iterator, U: Iterator,
26072607
I::Item: IntoIterator<IntoIter = U, Item = U::Item>
@@ -2629,7 +2629,7 @@ impl<I, U> Iterator for Flatten<I>
26292629
}
26302630
}
26312631

2632-
#[stable(feature = "iterator_flatten", since = "1.29")]
2632+
#[stable(feature = "iterator_flatten", since = "1.29.0")]
26332633
impl<I, U> DoubleEndedIterator for Flatten<I>
26342634
where I: DoubleEndedIterator, U: DoubleEndedIterator,
26352635
I::Item: IntoIterator<IntoIter = U, Item = U::Item>
@@ -2652,7 +2652,7 @@ impl<I, U> DoubleEndedIterator for Flatten<I>
26522652
}
26532653
}
26542654

2655-
#[stable(feature = "iterator_flatten", since = "1.29")]
2655+
#[stable(feature = "iterator_flatten", since = "1.29.0")]
26562656
impl<I, U> FusedIterator for Flatten<I>
26572657
where I: FusedIterator, U: Iterator,
26582658
I::Item: IntoIterator<IntoIter = U, Item = U::Item> {}

0 commit comments

Comments
 (0)