diff options
| author | bors <bors@rust-lang.org> | 2015-03-01 04:06:03 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-03-01 04:06:03 +0000 |
| commit | 341a9ca1e324d7b7427334b32e99e6d8bc82e9a6 (patch) | |
| tree | 76575092538619d28bc871d2fe9b4a931b2fa3d0 | |
| parent | 2b27dfd30ac5a95608d49e3425a3ff40f8da7dee (diff) | |
| parent | 2b8207a56d74bf97d93db2aad962c7ce56d3b98a (diff) | |
| download | rust-341a9ca1e324d7b7427334b32e99e6d8bc82e9a6.tar.gz rust-341a9ca1e324d7b7427334b32e99e6d8bc82e9a6.zip | |
Auto merge of #22898 - edwardw:one-less-unsafe-impl, r=huonw
These implementations were temporary workaround. Now #22828 has been fixed, they can be removed.
| -rw-r--r-- | src/libcore/iter.rs | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/libcore/iter.rs b/src/libcore/iter.rs index 4c9e8f47d0e..88a729a3db0 100644 --- a/src/libcore/iter.rs +++ b/src/libcore/iter.rs @@ -68,7 +68,7 @@ use num::{ToPrimitive, Int}; use ops::{Add, Deref, FnMut}; use option::Option; use option::Option::{Some, None}; -use marker::{Send, Sized, Sync}; +use marker::Sized; use usize; /// An interface for dealing with "external iterators". These types of iterators @@ -1783,10 +1783,6 @@ pub struct Peekable<I: Iterator> { peeked: Option<I::Item>, } -// FIXME: after #22828 being fixed, the following unsafe impl should be removed -unsafe impl<I: Iterator> Sync for Peekable<I> where I: Sync, I::Item: Sync {} -unsafe impl<I: Iterator> Send for Peekable<I> where I: Send, I::Item: Send {} - impl<I: Iterator + Clone> Clone for Peekable<I> where I::Item: Clone { fn clone(&self) -> Peekable<I> { Peekable { |