diff options
| author | Manish Goregaokar <manishsmail@gmail.com> | 2016-03-31 05:04:59 +0530 |
|---|---|---|
| committer | Manish Goregaokar <manishsmail@gmail.com> | 2016-03-31 05:04:59 +0530 |
| commit | cb5af8901ab2f4af231936473774df9a859ef256 (patch) | |
| tree | 82ba17f2d70781003c90db752823c524c8cdfbc8 /src/libstd | |
| parent | 74546e8ab795a5fabdf4f5079a875b8c69573003 (diff) | |
| parent | 99501e6177b2614708dd30fe06109415015b1158 (diff) | |
Rollup merge of #32612 - frewsxcv:unnecessary-coercions, r=alexcrichton
Remove no longer necessary coercions to fn pointer types. Originally added in 8fe9e4dff6d9d0fdd940835ae377edcb3754f8c1. Everything appears to build fine without the coercions, so they can presumably be removed.
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/collections/hash/map.rs | 8 | ||||
| -rw-r--r-- | src/libstd/collections/hash/set.rs | 4 |
2 files changed, 0 insertions, 12 deletions
diff --git a/src/libstd/collections/hash/map.rs b/src/libstd/collections/hash/map.rs index 7ab5c90b0ab..1d21d2d18e4 100644 --- a/src/libstd/collections/hash/map.rs +++ b/src/libstd/collections/hash/map.rs @@ -837,8 +837,6 @@ impl<K, V, S> HashMap<K, V, S> #[stable(feature = "rust1", since = "1.0.0")] pub fn keys<'a>(&'a self) -> Keys<'a, K, V> { fn first<A, B>((a, _): (A, B)) -> A { a } - let first: fn((&'a K,&'a V)) -> &'a K = first; // coerce to fn ptr - Keys { inner: self.iter().map(first) } } @@ -862,8 +860,6 @@ impl<K, V, S> HashMap<K, V, S> #[stable(feature = "rust1", since = "1.0.0")] pub fn values<'a>(&'a self) -> Values<'a, K, V> { fn second<A, B>((_, b): (A, B)) -> B { b } - let second: fn((&'a K,&'a V)) -> &'a V = second; // coerce to fn ptr - Values { inner: self.iter().map(second) } } @@ -997,8 +993,6 @@ impl<K, V, S> HashMap<K, V, S> #[stable(feature = "drain", since = "1.6.0")] pub fn drain(&mut self) -> Drain<K, V> { fn last_two<A, B, C>((_, b, c): (A, B, C)) -> (B, C) { (b, c) } - let last_two: fn((SafeHash, K, V)) -> (K, V) = last_two; // coerce to fn pointer - Drain { inner: self.table.drain().map(last_two), } @@ -1404,8 +1398,6 @@ impl<K, V, S> IntoIterator for HashMap<K, V, S> /// ``` fn into_iter(self) -> IntoIter<K, V> { fn last_two<A, B, C>((_, b, c): (A, B, C)) -> (B, C) { (b, c) } - let last_two: fn((SafeHash, K, V)) -> (K, V) = last_two; - IntoIter { inner: self.table.into_iter().map(last_two) } diff --git a/src/libstd/collections/hash/set.rs b/src/libstd/collections/hash/set.rs index fdde1773a45..24dfcb1a9b7 100644 --- a/src/libstd/collections/hash/set.rs +++ b/src/libstd/collections/hash/set.rs @@ -415,8 +415,6 @@ impl<T, S> HashSet<T, S> #[stable(feature = "drain", since = "1.6.0")] pub fn drain(&mut self) -> Drain<T> { fn first<A, B>((a, _): (A, B)) -> A { a } - let first: fn((T, ())) -> T = first; // coerce to fn pointer - Drain { iter: self.map.drain().map(first) } } @@ -892,8 +890,6 @@ impl<T, S> IntoIterator for HashSet<T, S> /// ``` fn into_iter(self) -> IntoIter<T> { fn first<A, B>((a, _): (A, B)) -> A { a } - let first: fn((T, ())) -> T = first; - IntoIter { iter: self.map.into_iter().map(first) } } } |
