Delete Decoder::read_map_elt_key

diff --git a/compiler/rustc_serialize/src/collection_impls.rs b/compiler/rustc_serialize/src/collection_impls.rs
index e53a6dc47b40ae5c760d945810c39dd76b803b47..439641400d57594a295bde42607befbba0cadf5e 100644 (file)
--- a/compiler/rustc_serialize/src/collection_impls.rs
+++ b/compiler/rustc_serialize/src/collection_impls.rs
@@ -81,7 +81,7 @@ fn decode(d: &mut D) -> BTreeMap<K, V> {
         d.read_map(|d, len| {
             let mut map = BTreeMap::new();
             for _ in 0..len {
-                let key = d.read_map_elt_key(|d| Decodable::decode(d));
+                let key = Decodable::decode(d);
                 let val = d.read_map_elt_val(|d| Decodable::decode(d));
                 map.insert(key, val);
             }
@@ -147,7 +147,7 @@ fn decode(d: &mut D) -> HashMap<K, V, S> {
             let state = Default::default();
             let mut map = HashMap::with_capacity_and_hasher(len, state);
             for _ in 0..len {
-                let key = d.read_map_elt_key(|d| Decodable::decode(d));
+                let key = Decodable::decode(d);
                 let val = d.read_map_elt_val(|d| Decodable::decode(d));
                 map.insert(key, val);
             }
@@ -226,7 +226,7 @@ fn decode(d: &mut D) -> indexmap::IndexMap<K, V, S> {
             let state = Default::default();
             let mut map = indexmap::IndexMap::with_capacity_and_hasher(len, state);
             for _ in 0..len {
-                let key = d.read_map_elt_key(|d| Decodable::decode(d));
+                let key = Decodable::decode(d);
                 let val = d.read_map_elt_val(|d| Decodable::decode(d));
                 map.insert(key, val);
             }

diff --git a/compiler/rustc_serialize/src/serialize.rs b/compiler/rustc_serialize/src/serialize.rs
index 16d9270b6093ee3bc2db02116758b65d63788283..53ab6eda6f181bf9b0c0ddc54289206a85381d69 100644 (file)
--- a/compiler/rustc_serialize/src/serialize.rs
+++ b/compiler/rustc_serialize/src/serialize.rs
@@ -226,14 +226,6 @@ fn read_map<T, F>(&mut self, f: F) -> T
         f(self, len)
     }
 
-    #[inline]
-    fn read_map_elt_key<T, F>(&mut self, f: F) -> T
-    where
-        F: FnOnce(&mut Self) -> T,
-    {
-        f(self)
-    }
-
     #[inline]
     fn read_map_elt_val<T, F>(&mut self, f: F) -> T
     where