diff options
| author | Guillaume Gomez <guillaume1.gomez@gmail.com> | 2018-08-15 19:20:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-15 19:20:29 +0200 |
| commit | b9a51ce2f6200ffe690ab80bca817f11f3eda5e7 (patch) | |
| tree | 6a69235d593dc270005c6c2af837529868f33da6 | |
| parent | 7acfa8615a667d194211857cc16be4c0138d4e69 (diff) | |
| parent | 1a0d3f0979c40068b9a34e04dcc5f92d9cbef8c5 (diff) | |
| download | rust-b9a51ce2f6200ffe690ab80bca817f11f3eda5e7.tar.gz rust-b9a51ce2f6200ffe690ab80bca817f11f3eda5e7.zip | |
Rollup merge of #53396 - matklad:fix-flatten-since, r=varkor
Fix since of Iterator::flatten to be a proper semver r? @kennytm
| -rw-r--r-- | src/libcore/iter/iterator.rs | 2 | ||||
| -rw-r--r-- | src/libcore/iter/mod.rs | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/libcore/iter/iterator.rs b/src/libcore/iter/iterator.rs index 5681cfb04f2..39185291053 100644 --- a/src/libcore/iter/iterator.rs +++ b/src/libcore/iter/iterator.rs @@ -1110,7 +1110,7 @@ pub trait Iterator { /// /// [`flat_map()`]: #method.flat_map #[inline] - #[stable(feature = "iterator_flatten", since = "1.29")] + #[stable(feature = "iterator_flatten", since = "1.29.0")] fn flatten(self) -> Flatten<Self> where Self: Sized, Self::Item: IntoIterator { Flatten { inner: flatten_compat(self) } diff --git a/src/libcore/iter/mod.rs b/src/libcore/iter/mod.rs index 35ae7741106..ef3f4ced4f9 100644 --- a/src/libcore/iter/mod.rs +++ b/src/libcore/iter/mod.rs @@ -2577,13 +2577,13 @@ impl<I, U, F> FusedIterator for FlatMap<I, U, F> /// [`flatten`]: trait.Iterator.html#method.flatten /// [`Iterator`]: trait.Iterator.html #[must_use = "iterator adaptors are lazy and do nothing unless consumed"] -#[stable(feature = "iterator_flatten", since = "1.29")] +#[stable(feature = "iterator_flatten", since = "1.29.0")] pub struct Flatten<I: Iterator> where I::Item: IntoIterator { inner: FlattenCompat<I, <I::Item as IntoIterator>::IntoIter>, } -#[stable(feature = "iterator_flatten", since = "1.29")] +#[stable(feature = "iterator_flatten", since = "1.29.0")] impl<I, U> fmt::Debug for Flatten<I> where I: Iterator + fmt::Debug, U: Iterator + fmt::Debug, I::Item: IntoIterator<IntoIter = U, Item = U::Item>, @@ -2593,7 +2593,7 @@ impl<I, U> fmt::Debug for Flatten<I> } } -#[stable(feature = "iterator_flatten", since = "1.29")] +#[stable(feature = "iterator_flatten", since = "1.29.0")] impl<I, U> Clone for Flatten<I> where I: Iterator + Clone, U: Iterator + Clone, I::Item: IntoIterator<IntoIter = U, Item = U::Item>, @@ -2601,7 +2601,7 @@ impl<I, U> Clone for Flatten<I> fn clone(&self) -> Self { Flatten { inner: self.inner.clone() } } } -#[stable(feature = "iterator_flatten", since = "1.29")] +#[stable(feature = "iterator_flatten", since = "1.29.0")] impl<I, U> Iterator for Flatten<I> where I: Iterator, U: Iterator, I::Item: IntoIterator<IntoIter = U, Item = U::Item> @@ -2629,7 +2629,7 @@ impl<I, U> Iterator for Flatten<I> } } -#[stable(feature = "iterator_flatten", since = "1.29")] +#[stable(feature = "iterator_flatten", since = "1.29.0")] impl<I, U> DoubleEndedIterator for Flatten<I> where I: DoubleEndedIterator, U: DoubleEndedIterator, I::Item: IntoIterator<IntoIter = U, Item = U::Item> @@ -2652,7 +2652,7 @@ impl<I, U> DoubleEndedIterator for Flatten<I> } } -#[stable(feature = "iterator_flatten", since = "1.29")] +#[stable(feature = "iterator_flatten", since = "1.29.0")] impl<I, U> FusedIterator for Flatten<I> where I: FusedIterator, U: Iterator, I::Item: IntoIterator<IntoIter = U, Item = U::Item> {} |