Skip to content

Commit 025e1b5

Browse files
Delete Decoder::read_map_elt_key
1 parent 38e6dad commit 025e1b5

File tree

2 files changed

+3
-11
lines changed

2 files changed

+3
-11
lines changed

compiler/rustc_serialize/src/collection_impls.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ where
8181
d.read_map(|d, len| {
8282
let mut map = BTreeMap::new();
8383
for _ in 0..len {
84-
let key = d.read_map_elt_key(|d| Decodable::decode(d));
84+
let key = Decodable::decode(d);
8585
let val = d.read_map_elt_val(|d| Decodable::decode(d));
8686
map.insert(key, val);
8787
}
@@ -147,7 +147,7 @@ where
147147
let state = Default::default();
148148
let mut map = HashMap::with_capacity_and_hasher(len, state);
149149
for _ in 0..len {
150-
let key = d.read_map_elt_key(|d| Decodable::decode(d));
150+
let key = Decodable::decode(d);
151151
let val = d.read_map_elt_val(|d| Decodable::decode(d));
152152
map.insert(key, val);
153153
}
@@ -226,7 +226,7 @@ where
226226
let state = Default::default();
227227
let mut map = indexmap::IndexMap::with_capacity_and_hasher(len, state);
228228
for _ in 0..len {
229-
let key = d.read_map_elt_key(|d| Decodable::decode(d));
229+
let key = Decodable::decode(d);
230230
let val = d.read_map_elt_val(|d| Decodable::decode(d));
231231
map.insert(key, val);
232232
}

compiler/rustc_serialize/src/serialize.rs

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -226,14 +226,6 @@ pub trait Decoder {
226226
f(self, len)
227227
}
228228

229-
#[inline]
230-
fn read_map_elt_key<T, F>(&mut self, f: F) -> T
231-
where
232-
F: FnOnce(&mut Self) -> T,
233-
{
234-
f(self)
235-
}
236-
237229
#[inline]
238230
fn read_map_elt_val<T, F>(&mut self, f: F) -> T
239231
where

0 commit comments

Comments
 (0)