Skip to content

Commit 2d8595e

Browse files
Delete Decoder::read_tuple_arg
1 parent 886c72d commit 2d8595e

File tree

1 file changed

+1
-12
lines changed

1 file changed

+1
-12
lines changed

compiler/rustc_serialize/src/serialize.rs

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -210,14 +210,6 @@ pub trait Decoder {
210210
f(self, disr)
211211
}
212212

213-
#[inline]
214-
fn read_tuple_arg<T, F>(&mut self, f: F) -> T
215-
where
216-
F: FnOnce(&mut Self) -> T,
217-
{
218-
f(self)
219-
}
220-
221213
// Specialized types:
222214
fn read_option<T, F>(&mut self, mut f: F) -> T
223215
where
@@ -568,11 +560,8 @@ macro_rules! tuple {
568560
() => ();
569561
( $($name:ident,)+ ) => (
570562
impl<D: Decoder, $($name: Decodable<D>),+> Decodable<D> for ($($name,)+) {
571-
#[allow(non_snake_case)]
572563
fn decode(d: &mut D) -> ($($name,)+) {
573-
($(d.read_tuple_arg(|d| -> $name {
574-
Decodable::decode(d)
575-
}),)+)
564+
($({ let element: $name = Decodable::decode(d); element },)+)
576565
}
577566
}
578567
impl<S: Encoder, $($name: Encodable<S>),+> Encodable<S> for ($($name,)+) {

0 commit comments

Comments
 (0)