about summary refs log tree commit diff
diff options
context:
space:
mode:
authorkennytm <kennytm@gmail.com>2018-03-16 05:38:29 +0800
committerkennytm <kennytm@gmail.com>2018-03-16 05:38:29 +0800
commitfb49ae026052f9d04a1c42ddabc5d4b0db568160 (patch)
tree97c063b4a6152df4dc2a6e3ae7149ef54e62d5eb
parenta199fb23196f25bc7de7504835185b26e6f75512 (diff)
parent6fbdaf42097f2e8fda09692693c7a27acb4c0ef2 (diff)
downloadrust-fb49ae026052f9d04a1c42ddabc5d4b0db568160.tar.gz
rust-fb49ae026052f9d04a1c42ddabc5d4b0db568160.zip
Rollup merge of #49049 - Centril:fix/flatten-fusediterator, r=bluss
Unstabilize FusedIterator for Flatten since Flatten is unstable

PR #47463 made `impl<I, U> FusedIterator for Flatten<I>` stable but shouldn't have since `Flatten` is still unstable. This PR makes the impl unstable again.
-rw-r--r--src/libcore/iter/mod.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libcore/iter/mod.rs b/src/libcore/iter/mod.rs
index a6802d606ca..b1b783b47c7 100644
--- a/src/libcore/iter/mod.rs
+++ b/src/libcore/iter/mod.rs
@@ -2605,7 +2605,7 @@ impl<I, U> DoubleEndedIterator for Flatten<I>
     }
 }
 
-#[stable(feature = "fused", since = "1.26.0")]
+#[unstable(feature = "iterator_flatten", issue = "48213")]
 impl<I, U> FusedIterator for Flatten<I>
     where I: FusedIterator, U: Iterator,
           I::Item: IntoIterator<IntoIter = U, Item = U::Item> {}