mikros/serde
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

rename deserialize_fixed_size_array to deserialize_seq_fixed_size

Browse Source
This commit is contained in:
Oliver Schneider 2016-07-20 19:20:31 +02:00
parent 65eb116a85
commit 4280dd466d
No known key found for this signature in database
GPG Key ID: 56D6EEA0FC67AC46
5 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
serde/src/de/impls.rs
View File

@ -593,7 +593,7 @@ macro_rules! array_impls {
fn deserialize<D>(deserializer: &mut D) -> Result<[T; $len], D::Error> fn deserialize<D>(deserializer: &mut D) -> Result<[T; $len], D::Error>
where D: Deserializer, where D: Deserializer,
{ {
deserializer.deserialize_fixed_size_array($len, $visitor::new()) deserializer.deserialize_seq_fixed_size($len, $visitor::new())
} }
} }
)+ )+

6
serde/src/de/mod.rs
View File

@ -28,8 +28,8 @@ macro_rules! de_forward_to_deserialize {
(func: deserialize_tuple) => { (func: deserialize_tuple) => {
de_forward_to_deserialize!{tup_fn: deserialize_tuple} de_forward_to_deserialize!{tup_fn: deserialize_tuple}
}; };
(func: deserialize_fixed_size_array) => { (func: deserialize_seq_fixed_size) => {
de_forward_to_deserialize!{tup_fn: deserialize_fixed_size_array} de_forward_to_deserialize!{tup_fn: deserialize_seq_fixed_size}
}; };
(func: deserialize_tuple_struct) => { (func: deserialize_tuple_struct) => {
#[inline] #[inline]
@ -400,7 +400,7 @@ pub trait Deserializer {
/// This method hints that the `Deserialize` type is expecting a fixed size array. This allows /// This method hints that the `Deserialize` type is expecting a fixed size array. This allows
/// deserializers to parse arrays that aren't tagged as arrays. /// deserializers to parse arrays that aren't tagged as arrays.
fn deserialize_fixed_size_array<V>(&mut self, fn deserialize_seq_fixed_size<V>(&mut self,
_len: usize, _len: usize,
visitor: V) -> Result<V::Value, Self::Error> visitor: V) -> Result<V::Value, Self::Error>
where V: Visitor; where V: Visitor;

20
serde/src/de/value.rs
View File

@ -183,7 +183,7 @@ impl<E> de::Deserializer for UnitDeserializer<E>
deserialize_ignored_any, deserialize_ignored_any,
deserialize_bytes, deserialize_bytes,
deserialize_unit_struct, deserialize_unit, deserialize_unit_struct, deserialize_unit,
deserialize_seq, deserialize_fixed_size_array, deserialize_seq, deserialize_seq_fixed_size,
deserialize_map, deserialize_newtype_struct, deserialize_struct_field, deserialize_map, deserialize_newtype_struct, deserialize_struct_field,
deserialize_tuple, deserialize_tuple,
deserialize_enum, deserialize_enum,
@ -234,7 +234,7 @@ macro_rules! primitive_deserializer {
deserialize_ignored_any, deserialize_ignored_any,
deserialize_bytes, deserialize_bytes,
deserialize_unit_struct, deserialize_unit, deserialize_unit_struct, deserialize_unit,
deserialize_seq, deserialize_fixed_size_array, deserialize_seq, deserialize_seq_fixed_size,
deserialize_map, deserialize_newtype_struct, deserialize_struct_field, deserialize_map, deserialize_newtype_struct, deserialize_struct_field,
deserialize_tuple, deserialize_tuple,
deserialize_enum, deserialize_enum,
@ -316,7 +316,7 @@ impl<'a, E> de::Deserializer for StrDeserializer<'a, E>
deserialize_ignored_any, deserialize_ignored_any,
deserialize_bytes, deserialize_bytes,
deserialize_unit_struct, deserialize_unit, deserialize_unit_struct, deserialize_unit,
deserialize_seq, deserialize_fixed_size_array, deserialize_seq, deserialize_seq_fixed_size,
deserialize_map, deserialize_newtype_struct, deserialize_struct_field, deserialize_map, deserialize_newtype_struct, deserialize_struct_field,
deserialize_tuple, deserialize_tuple,
deserialize_struct, deserialize_tuple_struct, deserialize_struct, deserialize_tuple_struct,
@ -413,7 +413,7 @@ impl<E> de::Deserializer for StringDeserializer<E>
deserialize_ignored_any, deserialize_ignored_any,
deserialize_bytes, deserialize_bytes,
deserialize_unit_struct, deserialize_unit, deserialize_unit_struct, deserialize_unit,
deserialize_seq, deserialize_fixed_size_array, deserialize_seq, deserialize_seq_fixed_size,
deserialize_map, deserialize_newtype_struct, deserialize_struct_field, deserialize_map, deserialize_newtype_struct, deserialize_struct_field,
deserialize_tuple, deserialize_tuple,
deserialize_struct, deserialize_tuple_struct, deserialize_struct, deserialize_tuple_struct,
@ -505,7 +505,7 @@ impl<I, T, E> de::Deserializer for SeqDeserializer<I, E>
deserialize_ignored_any, deserialize_ignored_any,
deserialize_bytes, deserialize_bytes,
deserialize_unit_struct, deserialize_unit, deserialize_unit_struct, deserialize_unit,
deserialize_seq, deserialize_fixed_size_array, deserialize_seq, deserialize_seq_fixed_size,
deserialize_map, deserialize_newtype_struct, deserialize_struct_field, deserialize_map, deserialize_newtype_struct, deserialize_struct_field,
deserialize_tuple, deserialize_tuple,
deserialize_enum, deserialize_enum,
@ -628,7 +628,7 @@ impl<V_, E> de::Deserializer for SeqVisitorDeserializer<V_, E>
deserialize_ignored_any, deserialize_ignored_any,
deserialize_bytes, deserialize_bytes,
deserialize_unit_struct, deserialize_unit, deserialize_unit_struct, deserialize_unit,
deserialize_seq, deserialize_fixed_size_array, deserialize_seq, deserialize_seq_fixed_size,
deserialize_map, deserialize_newtype_struct, deserialize_struct_field, deserialize_map, deserialize_newtype_struct, deserialize_struct_field,
deserialize_tuple, deserialize_tuple,
deserialize_enum, deserialize_enum,
@ -692,7 +692,7 @@ impl<I, K, V, E> de::Deserializer for MapDeserializer<I, K, V, E>
deserialize_ignored_any, deserialize_ignored_any,
deserialize_bytes, deserialize_bytes,
deserialize_unit_struct, deserialize_unit, deserialize_unit_struct, deserialize_unit,
deserialize_seq, deserialize_fixed_size_array, deserialize_seq, deserialize_seq_fixed_size,
deserialize_map, deserialize_newtype_struct, deserialize_struct_field, deserialize_map, deserialize_newtype_struct, deserialize_struct_field,
deserialize_tuple, deserialize_tuple,
deserialize_enum, deserialize_enum,
@ -820,7 +820,7 @@ impl<V_, E> de::Deserializer for MapVisitorDeserializer<V_, E>
deserialize_ignored_any, deserialize_ignored_any,
deserialize_bytes, deserialize_bytes,
deserialize_unit_struct, deserialize_unit, deserialize_unit_struct, deserialize_unit,
deserialize_seq, deserialize_fixed_size_array, deserialize_seq, deserialize_seq_fixed_size,
deserialize_map, deserialize_newtype_struct, deserialize_struct_field, deserialize_map, deserialize_newtype_struct, deserialize_struct_field,
deserialize_tuple, deserialize_tuple,
deserialize_enum, deserialize_enum,
@ -867,7 +867,7 @@ impl<'a, E> de::Deserializer for BytesDeserializer<'a, E>
deserialize_ignored_any, deserialize_ignored_any,
deserialize_bytes, deserialize_bytes,
deserialize_unit_struct, deserialize_unit, deserialize_unit_struct, deserialize_unit,
deserialize_seq, deserialize_fixed_size_array, deserialize_seq, deserialize_seq_fixed_size,
deserialize_map, deserialize_newtype_struct, deserialize_struct_field, deserialize_map, deserialize_newtype_struct, deserialize_struct_field,
deserialize_tuple, deserialize_tuple,
deserialize_enum, deserialize_enum,
@ -918,7 +918,7 @@ impl<E> de::Deserializer for ByteBufDeserializer<E>
deserialize_ignored_any, deserialize_ignored_any,
deserialize_bytes, deserialize_bytes,
deserialize_unit_struct, deserialize_unit, deserialize_unit_struct, deserialize_unit,
deserialize_seq, deserialize_fixed_size_array, deserialize_seq, deserialize_seq_fixed_size,
deserialize_map, deserialize_newtype_struct, deserialize_struct_field, deserialize_map, deserialize_newtype_struct, deserialize_struct_field,
deserialize_tuple, deserialize_tuple,
deserialize_enum, deserialize_enum,

2
serde_test/src/de.rs
View File

@ -255,7 +255,7 @@ impl<I> de::Deserializer for Deserializer<I>
} }
} }
fn deserialize_fixed_size_array<V>(&mut self, fn deserialize_seq_fixed_size<V>(&mut self,
len: usize, len: usize,
visitor: V) -> Result<V::Value, Error> visitor: V) -> Result<V::Value, Error>
where V: Visitor, where V: Visitor,

2
testing/tests/test_bytes.rs
View File

@ -315,7 +315,7 @@ impl serde::Deserializer for BytesDeserializer {
deserialize_char, deserialize_str, deserialize_string, deserialize_char, deserialize_str, deserialize_string,
deserialize_ignored_any, deserialize_ignored_any,
deserialize_unit_struct, deserialize_unit, deserialize_unit_struct, deserialize_unit,
deserialize_seq, deserialize_fixed_size_array, deserialize_seq, deserialize_seq_fixed_size,
deserialize_map, deserialize_newtype_struct, deserialize_struct_field, deserialize_map, deserialize_newtype_struct, deserialize_struct_field,
deserialize_tuple, deserialize_tuple,
deserialize_enum, deserialize_enum,