diff --git a/compiler/rustc_query_system/src/dep_graph/serialized.rs b/compiler/rustc_query_system/src/dep_graph/serialized.rs index 29db5a9878e0..2ac5d5431a5b 100644 --- a/compiler/rustc_query_system/src/dep_graph/serialized.rs +++ b/compiler/rustc_query_system/src/dep_graph/serialized.rs @@ -133,7 +133,7 @@ impl<'a, K: DepKind + Decodable>> Decodable>> Encodable for SmallVec { impl>> Decodable for SmallVec { fn decode(d: &mut D) -> SmallVec { - d.read_seq(|d, len| (0..len).map(|_| d.read_seq_elt(|d| Decodable::decode(d))).collect()) + d.read_seq(|d, len| (0..len).map(|_| Decodable::decode(d)).collect()) } } @@ -35,7 +35,7 @@ impl> Encodable for LinkedList { impl> Decodable for LinkedList { fn decode(d: &mut D) -> LinkedList { - d.read_seq(|d, len| (0..len).map(|_| d.read_seq_elt(|d| Decodable::decode(d))).collect()) + d.read_seq(|d, len| (0..len).map(|_| Decodable::decode(d)).collect()) } } @@ -52,7 +52,7 @@ impl> Encodable for VecDeque { impl> Decodable for VecDeque { fn decode(d: &mut D) -> VecDeque { - d.read_seq(|d, len| (0..len).map(|_| d.read_seq_elt(|d| Decodable::decode(d))).collect()) + d.read_seq(|d, len| (0..len).map(|_| Decodable::decode(d)).collect()) } } @@ -112,7 +112,7 @@ where d.read_seq(|d, len| { let mut set = BTreeSet::new(); for _ in 0..len { - set.insert(d.read_seq_elt(|d| Decodable::decode(d))); + set.insert(Decodable::decode(d)); } set }) @@ -191,7 +191,7 @@ where let state = Default::default(); let mut set = HashSet::with_capacity_and_hasher(len, state); for _ in 0..len { - set.insert(d.read_seq_elt(|d| Decodable::decode(d))); + set.insert(Decodable::decode(d)); } set }) @@ -260,7 +260,7 @@ where let state = Default::default(); let mut set = indexmap::IndexSet::with_capacity_and_hasher(len, state); for _ in 0..len { - set.insert(d.read_seq_elt(|d| Decodable::decode(d))); + set.insert(Decodable::decode(d)); } set }) diff --git a/compiler/rustc_serialize/src/serialize.rs b/compiler/rustc_serialize/src/serialize.rs index 660de8346a5b..9a45bc56ce17 100644 --- a/compiler/rustc_serialize/src/serialize.rs +++ b/compiler/rustc_serialize/src/serialize.rs @@ -230,14 +230,6 @@ pub trait Decoder { f(self, len) } - #[inline] - fn read_seq_elt(&mut self, f: F) -> T - where - F: FnOnce(&mut Self) -> T, - { - f(self) - } - fn read_map(&mut self, f: F) -> T where F: FnOnce(&mut Self, usize) -> T, @@ -449,10 +441,7 @@ impl> Decodable for Vec { unsafe { let ptr: *mut T = vec.as_mut_ptr(); for i in 0..len { - std::ptr::write( - ptr.offset(i as isize), - d.read_seq_elt(|d| Decodable::decode(d)), - ); + std::ptr::write(ptr.offset(i as isize), Decodable::decode(d)); } vec.set_len(len); } @@ -474,7 +463,7 @@ impl Decodable for [u8; N] { assert!(len == N); let mut v = [0u8; N]; for i in 0..len { - v[i] = d.read_seq_elt(|d| Decodable::decode(d)); + v[i] = Decodable::decode(d); } v })