about summary refs log tree commit diff
path: root/compiler/rustc_serialize
diff options
context:
space:
mode:
authorMark Rousskov <mark.simulacrum@gmail.com>2022-02-09 17:37:17 -0500
committerMark Rousskov <mark.simulacrum@gmail.com>2022-02-20 18:58:22 -0500
commit2d8595e0d78377a39882b1b9cad8159adb365d69 (patch)
treedfa6edb5360f3a74621dad9f693642de968098c9 /compiler/rustc_serialize
parent886c72df379f23786d5bd5facc8a089d146a4c0c (diff)
downloadrust-2d8595e0d78377a39882b1b9cad8159adb365d69.tar.gz
rust-2d8595e0d78377a39882b1b9cad8159adb365d69.zip
Delete Decoder::read_tuple_arg
Diffstat (limited to 'compiler/rustc_serialize')
-rw-r--r--compiler/rustc_serialize/src/serialize.rs13
1 files changed, 1 insertions, 12 deletions
diff --git a/compiler/rustc_serialize/src/serialize.rs b/compiler/rustc_serialize/src/serialize.rs
index 0ecddf8c52f..660de8346a5 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_arg<T, F>(&mut self, f: F) -> T
-    where
-        F: FnOnce(&mut Self) -> T,
-    {
-        f(self)
-    }
-
     // Specialized types:
     fn read_option<T, F>(&mut self, mut f: F) -> T
     where
@@ -568,11 +560,8 @@ macro_rules! tuple {
     () => ();
     ( $($name:ident,)+ ) => (
         impl<D: Decoder, $($name: Decodable<D>),+> Decodable<D> for ($($name,)+) {
-            #[allow(non_snake_case)]
             fn decode(d: &mut D) -> ($($name,)+) {
-                ($(d.read_tuple_arg(|d| -> $name {
-                    Decodable::decode(d)
-                }),)+)
+                ($({ let element: $name = Decodable::decode(d); element },)+)
             }
         }
         impl<S: Encoder, $($name: Encodable<S>),+> Encodable<S> for ($($name,)+) {