Remove constructors for FlatMapAccess and FlatStructAccess
They are used only in one place each, so for simplifying understanding it is better to inline them
This commit is contained in:
parent
a901f50850
commit
e11d01fe1d
@ -2775,7 +2775,11 @@ where
|
|||||||
where
|
where
|
||||||
V: Visitor<'de>,
|
V: Visitor<'de>,
|
||||||
{
|
{
|
||||||
visitor.visit_map(FlatMapAccess::new(self.0.iter()))
|
visitor.visit_map(FlatMapAccess {
|
||||||
|
iter: self.0.iter(),
|
||||||
|
pending_content: None,
|
||||||
|
_marker: PhantomData,
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
fn deserialize_struct<V>(
|
fn deserialize_struct<V>(
|
||||||
@ -2787,7 +2791,12 @@ where
|
|||||||
where
|
where
|
||||||
V: Visitor<'de>,
|
V: Visitor<'de>,
|
||||||
{
|
{
|
||||||
visitor.visit_map(FlatStructAccess::new(self.0.iter_mut(), fields))
|
visitor.visit_map(FlatStructAccess {
|
||||||
|
iter: self.0.iter_mut(),
|
||||||
|
pending_content: None,
|
||||||
|
fields: fields,
|
||||||
|
_marker: PhantomData,
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
fn deserialize_newtype_struct<V>(self, _name: &str, visitor: V) -> Result<V::Value, Self::Error>
|
fn deserialize_newtype_struct<V>(self, _name: &str, visitor: V) -> Result<V::Value, Self::Error>
|
||||||
@ -2847,19 +2856,6 @@ struct FlatMapAccess<'a, 'de: 'a, E> {
|
|||||||
_marker: PhantomData<E>,
|
_marker: PhantomData<E>,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(any(feature = "std", feature = "alloc"))]
|
|
||||||
impl<'a, 'de, E> FlatMapAccess<'a, 'de, E> {
|
|
||||||
fn new(
|
|
||||||
iter: slice::Iter<'a, Option<(Content<'de>, Content<'de>)>>,
|
|
||||||
) -> FlatMapAccess<'a, 'de, E> {
|
|
||||||
FlatMapAccess {
|
|
||||||
iter: iter,
|
|
||||||
pending_content: None,
|
|
||||||
_marker: PhantomData,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[cfg(any(feature = "std", feature = "alloc"))]
|
#[cfg(any(feature = "std", feature = "alloc"))]
|
||||||
impl<'a, 'de, E> MapAccess<'de> for FlatMapAccess<'a, 'de, E>
|
impl<'a, 'de, E> MapAccess<'de> for FlatMapAccess<'a, 'de, E>
|
||||||
where
|
where
|
||||||
@ -2904,21 +2900,6 @@ struct FlatStructAccess<'a, 'de: 'a, E> {
|
|||||||
_marker: PhantomData<E>,
|
_marker: PhantomData<E>,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(any(feature = "std", feature = "alloc"))]
|
|
||||||
impl<'a, 'de, E> FlatStructAccess<'a, 'de, E> {
|
|
||||||
fn new(
|
|
||||||
iter: slice::IterMut<'a, Option<(Content<'de>, Content<'de>)>>,
|
|
||||||
fields: &'static [&'static str],
|
|
||||||
) -> FlatStructAccess<'a, 'de, E> {
|
|
||||||
FlatStructAccess {
|
|
||||||
iter: iter,
|
|
||||||
pending_content: None,
|
|
||||||
fields: fields,
|
|
||||||
_marker: PhantomData,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[cfg(any(feature = "std", feature = "alloc"))]
|
#[cfg(any(feature = "std", feature = "alloc"))]
|
||||||
impl<'a, 'de, E> MapAccess<'de> for FlatStructAccess<'a, 'de, E>
|
impl<'a, 'de, E> MapAccess<'de> for FlatStructAccess<'a, 'de, E>
|
||||||
where
|
where
|
||||||
|
Loading…
x
Reference in New Issue
Block a user