pezkuwichain/serde
1
0
Fork 0
mirror of https://github.com/pezkuwichain/serde.git synced 2026-06-12 16:41:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update and tweak some names

Browse Source
This commit is contained in:
Erick Tryzelaar
2015-02-15 21:07:17 -08:00
parent 1f98ee0d8f
commit 67d7ac4468
2 changed files with 56 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
serde2/serde2_macros/src/lib.rs
+1 -1
View File
@@ -272,7 +272,7 @@ pub fn expand_derive_deserialize(cx: &mut ExtCtxt,
vec!["std", "result", "Result"], vec!["std", "result", "Result"],
None, None,
vec![ vec![
Box::new(Ty::Self), Box::new(Ty::Self_),
Box::new(Ty::Literal(Path::new_(vec!["__S", "Error"], Box::new(Ty::Literal(Path::new_(vec!["__S", "Error"],
None, None,
vec![], vec![],
serde2/src/de.rs
+55 -55
View File
@@ -16,8 +16,8 @@ pub trait Error {
pub trait Deserialize { pub trait Deserialize {
fn deserialize< fn deserialize<
S: Deserializer, D: Deserializer,
>(state: &mut S) -> Result<Self, S::Error>; >(deserializer: &mut D) -> Result<Self, D::Error>;
} }
pub trait Deserializer { pub trait Deserializer {
@@ -164,8 +164,8 @@ pub trait Visitor {
} }
fn visit_some< fn visit_some<
S: Deserializer, D: Deserializer,
>(&mut self, _state: &mut S) -> Result<Self::Value, S::Error> { >(&mut self, _deserializer: &mut D) -> Result<Self::Value, D::Error> {
Err(Error::syntax_error()) Err(Error::syntax_error())
} }
@@ -316,9 +316,9 @@ impl Visitor for UnitVisitor {
impl Deserialize for () { impl Deserialize for () {
fn deserialize< fn deserialize<
S: Deserializer, D: Deserializer,
>(state: &mut S) -> Result<(), S::Error> { >(deserializer: &mut D) -> Result<(), D::Error> {
state.visit(&mut UnitVisitor) deserializer.visit(&mut UnitVisitor)
} }
} }
@@ -338,9 +338,9 @@ impl Visitor for BoolVisitor {
impl Deserialize for bool { impl Deserialize for bool {
fn deserialize< fn deserialize<
S: Deserializer, D: Deserializer,
>(state: &mut S) -> Result<bool, S::Error> { >(deserializer: &mut D) -> Result<bool, D::Error> {
state.visit(&mut BoolVisitor) deserializer.visit(&mut BoolVisitor)
} }
} }
@@ -386,9 +386,9 @@ macro_rules! impl_deserialize_num {
impl Deserialize for $ty { impl Deserialize for $ty {
#[inline] #[inline]
fn deserialize< fn deserialize<
S: Deserializer, D: Deserializer,
>(state: &mut S) -> Result<$ty, S::Error> { >(deserializer: &mut D) -> Result<$ty, D::Error> {
state.visit(&mut PrimitiveVisitor) deserializer.visit(&mut PrimitiveVisitor)
} }
} }
} }
@@ -441,9 +441,9 @@ impl Visitor for CharVisitor {
impl Deserialize for char { impl Deserialize for char {
#[inline] #[inline]
fn deserialize< fn deserialize<
S: Deserializer, D: Deserializer,
>(state: &mut S) -> Result<char, S::Error> { >(deserializer: &mut D) -> Result<char, D::Error> {
state.visit(&mut CharVisitor) deserializer.visit(&mut CharVisitor)
} }
} }
@@ -469,9 +469,9 @@ impl Visitor for StringVisitor {
impl Deserialize for String { impl Deserialize for String {
fn deserialize< fn deserialize<
S: Deserializer, D: Deserializer,
>(state: &mut S) -> Result<String, S::Error> { >(deserializer: &mut D) -> Result<String, D::Error> {
state.visit(&mut StringVisitor) deserializer.visit(&mut StringVisitor)
} }
} }
@@ -493,17 +493,17 @@ impl<
#[inline] #[inline]
fn visit_some< fn visit_some<
S: Deserializer, D: Deserializer,
>(&mut self, state: &mut S) -> Result<Option<T>, S::Error> { >(&mut self, deserializer: &mut D) -> Result<Option<T>, D::Error> {
Ok(Some(try!(Deserialize::deserialize(state)))) Ok(Some(try!(Deserialize::deserialize(deserializer))))
} }
} }
impl<T> Deserialize for Option<T> where T: Deserialize { impl<T> Deserialize for Option<T> where T: Deserialize {
fn deserialize< fn deserialize<
S: Deserializer, D: Deserializer,
>(state: &mut S) -> Result<Option<T>, S::Error> { >(deserializer: &mut D) -> Result<Option<T>, D::Error> {
state.visit_option(&mut OptionVisitor) deserializer.visit_option(&mut OptionVisitor)
} }
} }
@@ -530,9 +530,9 @@ impl<T> Visitor for VecVisitor<T> where T: Deserialize {
impl<T: Deserialize> Deserialize for Vec<T> { impl<T: Deserialize> Deserialize for Vec<T> {
fn deserialize< fn deserialize<
S: Deserializer, D: Deserializer,
>(state: &mut S) -> Result<Vec<T>, S::Error> { >(deserializer: &mut D) -> Result<Vec<T>, D::Error> {
state.visit(&mut VecVisitor) deserializer.visit(&mut VecVisitor)
} }
} }
@@ -572,9 +572,9 @@ macro_rules! tuple_impls {
> Deserialize for ($($name,)+) { > Deserialize for ($($name,)+) {
#[inline] #[inline]
fn deserialize< fn deserialize<
S: Deserializer, D: Deserializer,
>(state: &mut S) -> Result<($($name,)+), S::Error> { >(deserializer: &mut D) -> Result<($($name,)+), D::Error> {
state.visit(&mut $visitor) deserializer.visit(&mut $visitor)
} }
} }
)+ )+
@@ -626,9 +626,9 @@ impl<K, V> Deserialize for HashMap<K, V>
V: Deserialize, V: Deserialize,
{ {
fn deserialize< fn deserialize<
S_: Deserializer, D: Deserializer,
>(state: &mut S_) -> Result<HashMap<K, V>, S_::Error> { >(deserializer: &mut D) -> Result<HashMap<K, V>, D::Error> {
state.visit(&mut HashMapVisitor) deserializer.visit(&mut HashMapVisitor)
} }
} }
@@ -661,9 +661,9 @@ impl<
V: Deserialize, V: Deserialize,
> Deserialize for BTreeMap<K, V> { > Deserialize for BTreeMap<K, V> {
fn deserialize< fn deserialize<
S: Deserializer, D: Deserializer,
>(state: &mut S) -> Result<BTreeMap<K, V>, S::Error> { >(deserializer: &mut D) -> Result<BTreeMap<K, V>, D::Error> {
state.visit(&mut BTreeMapVisitor) deserializer.visit(&mut BTreeMapVisitor)
} }
} }
@@ -992,9 +992,9 @@ mod tests {
impl Deserialize for NamedUnit { impl Deserialize for NamedUnit {
fn deserialize< fn deserialize<
S: Deserializer, D: Deserializer,
>(state: &mut S) -> Result<NamedUnit, S::Error> { >(deserializer: &mut D) -> Result<NamedUnit, D::Error> {
state.visit(&mut NamedUnitVisitor) deserializer.visit(&mut NamedUnitVisitor)
} }
} }
@@ -1034,9 +1034,9 @@ mod tests {
impl Deserialize for NamedSeq { impl Deserialize for NamedSeq {
fn deserialize< fn deserialize<
S: Deserializer, D: Deserializer,
>(state: &mut S) -> Result<NamedSeq, S::Error> { >(deserializer: &mut D) -> Result<NamedSeq, D::Error> {
state.visit(&mut NamedSeqVisitor) deserializer.visit(&mut NamedSeqVisitor)
} }
} }
@@ -1090,9 +1090,9 @@ mod tests {
impl Deserialize for NamedMap { impl Deserialize for NamedMap {
fn deserialize< fn deserialize<
S: Deserializer, D: Deserializer,
>(state: &mut S) -> Result<NamedMap, S::Error> { >(deserializer: &mut D) -> Result<NamedMap, D::Error> {
state.visit(&mut NamedMapVisitor) deserializer.visit(&mut NamedMapVisitor)
} }
} }
@@ -1141,9 +1141,9 @@ mod tests {
impl Deserialize for NamedMapField { impl Deserialize for NamedMapField {
fn deserialize< fn deserialize<
S: Deserializer, D: Deserializer,
>(state: &mut S) -> Result<NamedMapField, S::Error> { >(deserializer: &mut D) -> Result<NamedMapField, D::Error> {
state.visit(&mut NamedMapFieldVisitor) deserializer.visit(&mut NamedMapFieldVisitor)
} }
} }
@@ -1175,9 +1175,9 @@ mod tests {
impl Deserialize for Enum { impl Deserialize for Enum {
fn deserialize< fn deserialize<
S: Deserializer, D: Deserializer,
>(state: &mut S) -> Result<Enum, S::Error> { >(deserializer: &mut D) -> Result<Enum, D::Error> {
state.visit(&mut EnumVisitor) deserializer.visit(&mut EnumVisitor)
} }
} }
@@ -1275,9 +1275,9 @@ mod tests {
impl Deserialize for EnumMapField { impl Deserialize for EnumMapField {
fn deserialize< fn deserialize<
S: Deserializer, D: Deserializer,
>(state: &mut S) -> Result<EnumMapField, S::Error> { >(deserializer: &mut D) -> Result<EnumMapField, D::Error> {
state.visit(&mut EnumMapFieldVisitor) deserializer.visit(&mut EnumMapFieldVisitor)
} }
} }