pezkuwichain/serde
1
0
Fork 0
mirror of https://github.com/pezkuwichain/serde.git synced 2026-04-29 12:57:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename ser::Serializer::visit_enum_{unit,seq,map} to visit_{unit,tuple,struct}_variant

Browse Source
This commit is contained in:
Erick Tryzelaar
2015-07-29 12:25:16 -07:00
parent 351b7039a8
commit d2fef27721
6 changed files with 68 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
serde/src/ser/impls.rs
+2 -2
View File
@@ -631,7 +631,7 @@ impl<T, E> Serialize for Result<T, E> where T: Serialize, E: Serialize {
}
}
serializer.visit_enum_seq("Result", 0, "Ok", Visitor(Some(value)))
serializer.visit_tuple_variant("Result", 0, "Ok", Visitor(Some(value)))
}
Result::Err(ref value) => {
struct Visitor<'a, E: 'a>(Option<&'a E>);
@@ -652,7 +652,7 @@ impl<T, E> Serialize for Result<T, E> where T: Serialize, E: Serialize {
}
}
serializer.visit_enum_seq("Result", 1, "Err", Visitor(Some(value)))
serializer.visit_tuple_variant("Result", 1, "Err", Visitor(Some(value)))
}
}
}
serde/src/ser/mod.rs
+21 -17
View File
@@ -118,10 +118,10 @@ pub trait Serializer {
}
#[inline]
fn visit_enum_unit(&mut self,
_name: &'static str,
_variant_index: usize,
_variant: &'static str) -> Result<(), Self::Error> {
fn visit_unit_variant(&mut self,
_name: &'static str,
_variant_index: usize,
_variant: &'static str) -> Result<(), Self::Error> {
self.visit_unit()
}
@@ -175,18 +175,18 @@ pub trait Serializer {
}
#[inline]
fn visit_enum_seq<V>(&mut self,
_name: &'static str,
_variant_index: usize,
variant: &'static str,
visitor: V) -> Result<(), Self::Error>
fn visit_tuple_variant<V>(&mut self,
_name: &'static str,
_variant_index: usize,
variant: &'static str,
visitor: V) -> Result<(), Self::Error>
where V: SeqVisitor,
{
self.visit_tuple_struct(variant, visitor)
}
#[inline]
fn visit_enum_seq_elt<T>(&mut self, value: T) -> Result<(), Self::Error>
fn visit_tuple_variant_elt<T>(&mut self, value: T) -> Result<(), Self::Error>
where T: Serialize
{
self.visit_tuple_struct_elt(value)
@@ -209,7 +209,9 @@ pub trait Serializer {
}
#[inline]
fn visit_struct_elt<K, V>(&mut self, key: K, value: V) -> Result<(), Self::Error>
fn visit_struct_elt<K, V>(&mut self,
key: K,
value: V) -> Result<(), Self::Error>
where K: Serialize,
V: Serialize,
{
@@ -217,18 +219,20 @@ pub trait Serializer {
}
#[inline]
fn visit_enum_map<V>(&mut self,
_name: &'static str,
_variant_index: usize,
variant: &'static str,
visitor: V) -> Result<(), Self::Error>
fn visit_struct_variant<V>(&mut self,
_name: &'static str,
_variant_index: usize,
variant: &'static str,
visitor: V) -> Result<(), Self::Error>
where V: MapVisitor,
{
self.visit_struct(variant, visitor)
}
#[inline]
fn visit_enum_map_elt<K, V>(&mut self, key: K, value: V) -> Result<(), Self::Error>
fn visit_struct_variant_elt<K, V>(&mut self,
key: K,
value: V) -> Result<(), Self::Error>
where K: Serialize,
V: Serialize,
{