From 17bcb443cbeab81e513e5b7524a430e11d5f5a69 Mon Sep 17 00:00:00 2001 From: Manish Goregaokar Date: Fri, 25 Aug 2017 16:02:11 -0700 Subject: [PATCH] Kill fused --- src/hash/map.rs | 10 +--------- src/hash/set.rs | 29 +---------------------------- src/lib.rs | 2 +- 3 files changed, 3 insertions(+), 38 deletions(-) diff --git a/src/hash/map.rs b/src/hash/map.rs index e06b4d9d239..f2a03a21a90 100644 --- a/src/hash/map.rs +++ b/src/hash/map.rs @@ -16,7 +16,7 @@ use cmp::max; use fmt::{self, Debug}; #[allow(deprecated)] use hash::{Hash, BuildHasher}; -use iter::{FromIterator, FusedIterator}; +use iter::FromIterator; use mem::{self, replace}; use ops::{Deref, Index}; @@ -1613,7 +1613,6 @@ impl<'a, K, V> ExactSizeIterator for Iter<'a, K, V> { } } -impl<'a, K, V> FusedIterator for Iter<'a, K, V> {} impl<'a, K, V> Iterator for IterMut<'a, K, V> { type Item = (&'a K, &'a mut V); @@ -1633,7 +1632,6 @@ impl<'a, K, V> ExactSizeIterator for IterMut<'a, K, V> { self.inner.len() } } -impl<'a, K, V> FusedIterator for IterMut<'a, K, V> {} impl<'a, K, V> fmt::Debug for IterMut<'a, K, V> where K: fmt::Debug, @@ -1664,7 +1662,6 @@ impl ExactSizeIterator for IntoIter { self.inner.len() } } -impl FusedIterator for IntoIter {} impl fmt::Debug for IntoIter { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { @@ -1692,7 +1689,6 @@ impl<'a, K, V> ExactSizeIterator for Keys<'a, K, V> { self.inner.len() } } -impl<'a, K, V> FusedIterator for Keys<'a, K, V> {} impl<'a, K, V> Iterator for Values<'a, K, V> { type Item = &'a V; @@ -1712,8 +1708,6 @@ impl<'a, K, V> ExactSizeIterator for Values<'a, K, V> { self.inner.len() } } -impl<'a, K, V> FusedIterator for Values<'a, K, V> {} - impl<'a, K, V> Iterator for ValuesMut<'a, K, V> { type Item = &'a mut V; @@ -1732,7 +1726,6 @@ impl<'a, K, V> ExactSizeIterator for ValuesMut<'a, K, V> { self.inner.len() } } -impl<'a, K, V> FusedIterator for ValuesMut<'a, K, V> {} impl<'a, K, V> fmt::Debug for ValuesMut<'a, K, V> where K: fmt::Debug, @@ -1763,7 +1756,6 @@ impl<'a, K, V> ExactSizeIterator for Drain<'a, K, V> { self.inner.len() } } -impl<'a, K, V> FusedIterator for Drain<'a, K, V> {} impl<'a, K, V> fmt::Debug for Drain<'a, K, V> where K: fmt::Debug, diff --git a/src/hash/set.rs b/src/hash/set.rs index 87894d0b711..f96389bcfdc 100644 --- a/src/hash/set.rs +++ b/src/hash/set.rs @@ -11,7 +11,7 @@ use borrow::Borrow; use fmt; use hash::{Hash, BuildHasher}; -use iter::{Chain, FromIterator, FusedIterator}; +use iter::{Chain, FromIterator}; use ops::{BitOr, BitAnd, BitXor, Sub}; use super::Recover; @@ -1010,7 +1010,6 @@ impl<'a, K> ExactSizeIterator for Iter<'a, K> { self.iter.len() } } -impl<'a, K> FusedIterator for Iter<'a, K> {} impl<'a, K: fmt::Debug> fmt::Debug for Iter<'a, K> { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { @@ -1033,7 +1032,6 @@ impl ExactSizeIterator for IntoIter { self.iter.len() } } -impl FusedIterator for IntoIter {} impl fmt::Debug for IntoIter { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { @@ -1060,7 +1058,6 @@ impl<'a, K> ExactSizeIterator for Drain<'a, K> { self.iter.len() } } -impl<'a, K> FusedIterator for Drain<'a, K> {} impl<'a, K: fmt::Debug> fmt::Debug for Drain<'a, K> { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { @@ -1112,12 +1109,6 @@ impl<'a, T, S> fmt::Debug for Intersection<'a, T, S> } } -impl<'a, T, S> FusedIterator for Intersection<'a, T, S> - where T: Eq + Hash, - S: BuildHasher -{ -} - impl<'a, T, S> Clone for Difference<'a, T, S> { fn clone(&self) -> Difference<'a, T, S> { Difference { iter: self.iter.clone(), ..*self } @@ -1149,12 +1140,6 @@ impl<'a, T, S> Iterator for Difference<'a, T, S> } } -impl<'a, T, S> FusedIterator for Difference<'a, T, S> - where T: Eq + Hash, - S: BuildHasher -{ -} - impl<'a, T, S> fmt::Debug for Difference<'a, T, S> where T: fmt::Debug + Eq + Hash, S: BuildHasher @@ -1184,12 +1169,6 @@ impl<'a, T, S> Iterator for SymmetricDifference<'a, T, S> } } -impl<'a, T, S> FusedIterator for SymmetricDifference<'a, T, S> - where T: Eq + Hash, - S: BuildHasher -{ -} - impl<'a, T, S> fmt::Debug for SymmetricDifference<'a, T, S> where T: fmt::Debug + Eq + Hash, S: BuildHasher @@ -1205,12 +1184,6 @@ impl<'a, T, S> Clone for Union<'a, T, S> { } } -impl<'a, T, S> FusedIterator for Union<'a, T, S> - where T: Eq + Hash, - S: BuildHasher -{ -} - impl<'a, T, S> fmt::Debug for Union<'a, T, S> where T: fmt::Debug + Eq + Hash, S: BuildHasher diff --git a/src/lib.rs b/src/lib.rs index 07f152079ac..0a28542c224 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,5 +1,5 @@ #![feature(allocator_api)] -#![feature(alloc, shared, unique, fused)] +#![feature(alloc, shared, unique)] extern crate alloc;