From b0dc7ea6da10d5d089c52b73f59beefd2566e60b Mon Sep 17 00:00:00 2001 From: David Tolnay Date: Fri, 14 Apr 2017 15:03:43 -0700 Subject: [PATCH] Nicer type parameter for the access forwarding impls --- serde/src/de/mod.rs | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/serde/src/de/mod.rs b/serde/src/de/mod.rs index 5f9895d5..74fb629e 100644 --- a/serde/src/de/mod.rs +++ b/serde/src/de/mod.rs @@ -1383,14 +1383,14 @@ pub trait SeqAccess<'de> { } } -impl<'de, 'a, V> SeqAccess<'de> for &'a mut V +impl<'de, 'a, A> SeqAccess<'de> for &'a mut A where - V: SeqAccess<'de>, + A: SeqAccess<'de>, { - type Error = V::Error; + type Error = A::Error; #[inline] - fn next_element_seed(&mut self, seed: T) -> Result, V::Error> + fn next_element_seed(&mut self, seed: T) -> Result, Self::Error> where T: DeserializeSeed<'de>, { @@ -1398,7 +1398,7 @@ where } #[inline] - fn next_element(&mut self) -> Result, V::Error> + fn next_element(&mut self) -> Result, Self::Error> where T: Deserialize<'de>, { @@ -1511,11 +1511,11 @@ pub trait MapAccess<'de> { } } -impl<'de, 'a, V_> MapAccess<'de> for &'a mut V_ +impl<'de, 'a, A> MapAccess<'de> for &'a mut A where - V_: MapAccess<'de>, + A: MapAccess<'de>, { - type Error = V_::Error; + type Error = A::Error; #[inline] fn next_key_seed(&mut self, seed: K) -> Result, Self::Error> @@ -1547,7 +1547,7 @@ where } #[inline] - fn next_entry(&mut self) -> Result, V_::Error> + fn next_entry(&mut self) -> Result, Self::Error> where K: Deserialize<'de>, V: Deserialize<'de>, @@ -1556,7 +1556,7 @@ where } #[inline] - fn next_key(&mut self) -> Result, V_::Error> + fn next_key(&mut self) -> Result, Self::Error> where K: Deserialize<'de>, { @@ -1564,7 +1564,7 @@ where } #[inline] - fn next_value(&mut self) -> Result + fn next_value(&mut self) -> Result where V: Deserialize<'de>, {