]> git.lizzy.rs Git - rust.git/commitdiff
Delete Decoder::read_tuple
authorMark Rousskov <mark.simulacrum@gmail.com>
Wed, 9 Feb 2022 22:35:11 +0000 (17:35 -0500)
committerMark Rousskov <mark.simulacrum@gmail.com>
Sun, 20 Feb 2022 23:58:22 +0000 (18:58 -0500)
compiler/rustc_serialize/src/serialize.rs

index e755991e90316574c62ddde869ce3d780c8977ce..0ecddf8c52f2a7b76e0e602c8164bc93cac54994 100644 (file)
@@ -210,14 +210,6 @@ fn read_enum_variant<T, F>(&mut self, mut f: F) -> T
         f(self, disr)
     }
 
-    #[inline]
-    fn read_tuple<T, F>(&mut self, _len: usize, f: F) -> T
-    where
-        F: FnOnce(&mut Self) -> T,
-    {
-        f(self)
-    }
-
     #[inline]
     fn read_tuple_arg<T, F>(&mut self, f: F) -> T
     where
@@ -578,13 +570,9 @@ macro_rules! tuple {
         impl<D: Decoder, $($name: Decodable<D>),+> Decodable<D> 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<S: Encoder, $($name: Encodable<S>),+> Encodable<S> for ($($name,)+) {