From 886c72df379f23786d5bd5facc8a089d146a4c0c Mon Sep 17 00:00:00 2001 From: Mark Rousskov Date: Wed, 9 Feb 2022 17:35:11 -0500 Subject: [PATCH] Delete Decoder::read_tuple --- compiler/rustc_serialize/src/serialize.rs | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/compiler/rustc_serialize/src/serialize.rs b/compiler/rustc_serialize/src/serialize.rs index e755991e903..0ecddf8c52f 100644 --- a/compiler/rustc_serialize/src/serialize.rs +++ b/compiler/rustc_serialize/src/serialize.rs @@ -210,14 +210,6 @@ pub trait Decoder { f(self, disr) } - #[inline] - fn read_tuple(&mut self, _len: usize, f: F) -> T - where - F: FnOnce(&mut Self) -> T, - { - f(self) - } - #[inline] fn read_tuple_arg(&mut self, f: F) -> T where @@ -578,13 +570,9 @@ macro_rules! tuple { impl),+> Decodable for ($($name,)+) { #[allow(non_snake_case)] fn decode(d: &mut D) -> ($($name,)+) { - let len: usize = count!($($name)+); - d.read_tuple(len, |d| { - let ret = ($(d.read_tuple_arg(|d| -> $name { - Decodable::decode(d) - }),)+); - ret - }) + ($(d.read_tuple_arg(|d| -> $name { + Decodable::decode(d) + }),)+) } } impl),+> Encodable for ($($name,)+) {