diff options
| author | Manish Goregaokar <manishsmail@gmail.com> | 2015-03-01 01:18:59 +0530 |
|---|---|---|
| committer | Manish Goregaokar <manishsmail@gmail.com> | 2015-03-01 09:49:42 +0530 |
| commit | 3c1f61ce63e911698666c7da1bbf21cdc9818a84 (patch) | |
| tree | 2c767b86d65fc6d55f52dfd148ead5cf7d5970f1 | |
| parent | 4ac53cc6cef35beb7a517c48169dc36723dba7b1 (diff) | |
| parent | 2b8207a56d74bf97d93db2aad962c7ce56d3b98a (diff) | |
| download | rust-3c1f61ce63e911698666c7da1bbf21cdc9818a84.tar.gz rust-3c1f61ce63e911698666c7da1bbf21cdc9818a84.zip | |
Rollup 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 { |