about summary refs log tree commit diff
path: root/src/libcore
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2015-06-11 16:33:53 +0000
committerbors <bors@rust-lang.org>2015-06-11 16:33:53 +0000
commitdeff2f50a97342c8b2f92a124ded2d2ead7b2996 (patch)
tree9309584436728300c3bea072656c65c7f0ad5054 /src/libcore
parentc85f30736913cf42549d8e0fd40049b346b4cec4 (diff)
parente50675d549edfcb49f712ee3915155cf1cc8f1a2 (diff)
downloadrust-deff2f50a97342c8b2f92a124ded2d2ead7b2996.tar.gz
rust-deff2f50a97342c8b2f92a124ded2d2ead7b2996.zip
Auto merge of #26212 - Manishearth:rollup, r=Manishearth
- Successful merges: #26181, #26184, #26189, #26191, #26195, #26202
- Failed merges: 
Diffstat (limited to 'src/libcore')
-rw-r--r--src/libcore/iter.rs1
-rw-r--r--src/libcore/option.rs1
2 files changed, 2 insertions, 0 deletions
diff --git a/src/libcore/iter.rs b/src/libcore/iter.rs
index b12a1c1ed96..abee61ea9d6 100644
--- a/src/libcore/iter.rs
+++ b/src/libcore/iter.rs
@@ -3077,6 +3077,7 @@ pub fn empty<T>() -> Empty<T> {
 }
 
 /// An iterator that yields an element exactly once.
+#[derive(Clone)]
 #[unstable(feature="iter_once", reason = "new addition")]
 pub struct Once<T> {
     inner: ::option::IntoIter<T>
diff --git a/src/libcore/option.rs b/src/libcore/option.rs
index 872186c09e2..30ca64028e7 100644
--- a/src/libcore/option.rs
+++ b/src/libcore/option.rs
@@ -865,6 +865,7 @@ impl<'a, A> DoubleEndedIterator for IterMut<'a, A> {
 impl<'a, A> ExactSizeIterator for IterMut<'a, A> {}
 
 /// An iterator over the item contained inside an Option.
+#[derive(Clone)]
 #[stable(feature = "rust1", since = "1.0.0")]
 pub struct IntoIter<A> { inner: Item<A> }