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

Merge pull request #315 from dtolnay/underscore

Browse Source 
Prefix type parameters and lifetimes with double underscore
This commit is contained in:
Oliver Schneider 2016-05-11 11:06:25 +02:00
commit 6596f77e91
3 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
serde_codegen/src/attr.rs
View File

@ -563,37 +563,37 @@ fn wrap_serialize_with(cx: &ExtCtxt,
quote_expr!(cx, { quote_expr!(cx, {
trait __SerdeSerializeWith { trait __SerdeSerializeWith {
fn __serde_serialize_with<S>(&self, serializer: &mut S) -> Result<(), S::Error> fn __serde_serialize_with<__S>(&self, serializer: &mut __S) -> Result<(), __S::Error>
where S: _serde::ser::Serializer; where __S: _serde::ser::Serializer;
} }
impl<'a, T> __SerdeSerializeWith for &'a T impl<'__a, __T> __SerdeSerializeWith for &'__a __T
where T: 'a + __SerdeSerializeWith, where __T: '__a + __SerdeSerializeWith,
{ {
fn __serde_serialize_with<S>(&self, serializer: &mut S) -> Result<(), S::Error> fn __serde_serialize_with<__S>(&self, serializer: &mut __S) -> Result<(), __S::Error>
where S: _serde::ser::Serializer where __S: _serde::ser::Serializer
{ {
(**self).__serde_serialize_with(serializer) (**self).__serde_serialize_with(serializer)
} }
} }
impl $generics __SerdeSerializeWith for $container_ty $where_clause { impl $generics __SerdeSerializeWith for $container_ty $where_clause {
fn __serde_serialize_with<S>(&self, serializer: &mut S) -> Result<(), S::Error> fn __serde_serialize_with<__S>(&self, serializer: &mut __S) -> Result<(), __S::Error>
where S: _serde::ser::Serializer where __S: _serde::ser::Serializer
{ {
$expr $expr
} }
} }
struct __SerdeSerializeWithStruct<'a, T: 'a> { struct __SerdeSerializeWithStruct<'__a, __T: '__a> {
value: &'a T, value: &'__a __T,
} }
impl<'a, T> _serde::ser::Serialize for __SerdeSerializeWithStruct<'a, T> impl<'__a, __T> _serde::ser::Serialize for __SerdeSerializeWithStruct<'__a, __T>
where T: 'a + __SerdeSerializeWith where __T: '__a + __SerdeSerializeWith
{ {
fn serialize<S>(&self, serializer: &mut S) -> Result<(), S::Error> fn serialize<__S>(&self, serializer: &mut __S) -> Result<(), __S::Error>
where S: _serde::ser::Serializer where __S: _serde::ser::Serializer
{ {
self.value.__serde_serialize_with(serializer) self.value.__serde_serialize_with(serializer)
} }

38
serde_codegen/src/de.rs
View File

@ -356,15 +356,15 @@ fn deserialize_unit_struct(
type Value = $type_ident; type Value = $type_ident;
#[inline] #[inline]
fn visit_unit<E>(&mut self) -> ::std::result::Result<$type_ident, E> fn visit_unit<__E>(&mut self) -> ::std::result::Result<$type_ident, __E>
where E: _serde::de::Error, where __E: _serde::de::Error,
{ {
Ok($type_ident) Ok($type_ident)
} }
#[inline] #[inline]
fn visit_seq<V>(&mut self, mut visitor: V) -> ::std::result::Result<$type_ident, V::Error> fn visit_seq<__V>(&mut self, mut visitor: __V) -> ::std::result::Result<$type_ident, __V::Error>
where V: _serde::de::SeqVisitor, where __V: _serde::de::SeqVisitor,
{ {
try!(visitor.end()); try!(visitor.end());
self.visit_unit() self.visit_unit()
@ -408,8 +408,8 @@ fn deserialize_newtype_struct(
type Value = $ty; type Value = $ty;
#[inline] #[inline]
fn visit_newtype_struct<D>(&mut self, deserializer: &mut D) -> ::std::result::Result<Self::Value, D::Error> fn visit_newtype_struct<__E>(&mut self, deserializer: &mut __E) -> ::std::result::Result<Self::Value, __E::Error>
where D: _serde::de::Deserializer, where __E: _serde::de::Deserializer,
{ {
let value = try!(_serde::de::Deserialize::deserialize(deserializer)); let value = try!(_serde::de::Deserialize::deserialize(deserializer));
Ok($type_ident(value)) Ok($type_ident(value))
@ -1032,11 +1032,11 @@ fn deserialize_field_visitor(
let impl_item = quote_item!(cx, let impl_item = quote_item!(cx,
impl _serde::de::Deserialize for __Field { impl _serde::de::Deserialize for __Field {
#[inline] #[inline]
fn deserialize<D>(deserializer: &mut D) -> ::std::result::Result<__Field, D::Error> fn deserialize<__D>(deserializer: &mut __D) -> ::std::result::Result<__Field, __D::Error>
where D: _serde::de::Deserializer, where __D: _serde::de::Deserializer,
{ {
struct __FieldVisitor<D> { struct __FieldVisitor<__D> {
phantom: ::std::marker::PhantomData<D> phantom: ::std::marker::PhantomData<__D>
} }
impl<__D> _serde::de::Visitor for __FieldVisitor<__D> impl<__D> _serde::de::Visitor for __FieldVisitor<__D>
@ -1044,27 +1044,27 @@ fn deserialize_field_visitor(
{ {
type Value = __Field; type Value = __Field;
fn visit_usize<E>(&mut self, value: usize) -> ::std::result::Result<__Field, E> fn visit_usize<__E>(&mut self, value: usize) -> ::std::result::Result<__Field, __E>
where E: _serde::de::Error, where __E: _serde::de::Error,
{ {
$index_body $index_body
} }
fn visit_str<E>(&mut self, value: &str) -> ::std::result::Result<__Field, E> fn visit_str<__E>(&mut self, value: &str) -> ::std::result::Result<__Field, __E>
where E: _serde::de::Error, where __E: _serde::de::Error,
{ {
$str_body $str_body
} }
fn visit_bytes<E>(&mut self, value: &[u8]) -> ::std::result::Result<__Field, E> fn visit_bytes<__E>(&mut self, value: &[u8]) -> ::std::result::Result<__Field, __E>
where E: _serde::de::Error, where __E: _serde::de::Error,
{ {
$bytes_body $bytes_body
} }
} }
deserializer.deserialize_struct_field( deserializer.deserialize_struct_field(
__FieldVisitor::<D>{ __FieldVisitor::<__D>{
phantom: ::std::marker::PhantomData phantom: ::std::marker::PhantomData
} }
) )
@ -1309,8 +1309,8 @@ fn wrap_deserialize_with(
).unwrap(), ).unwrap(),
quote_stmt!(cx, quote_stmt!(cx,
impl $impl_generics _serde::de::Deserialize for $wrapper_ty $where_clause { impl $impl_generics _serde::de::Deserialize for $wrapper_ty $where_clause {
fn deserialize<D>(__d: &mut D) -> ::std::result::Result<Self, D::Error> fn deserialize<__D>(__d: &mut __D) -> ::std::result::Result<Self, __D::Error>
where D: _serde::de::Deserializer where __D: _serde::de::Deserializer
{ {
let value = try!($deserialize_with(__d)); let value = try!($deserialize_with(__d));
Ok(__SerdeDeserializeWithStruct { Ok(__SerdeDeserializeWithStruct {

8
serde_codegen/src/ser.rs
View File

@ -658,8 +658,8 @@ fn serialize_tuple_struct_visitor(
for Visitor $visitor_generics for Visitor $visitor_generics
$where_clause { $where_clause {
#[inline] #[inline]
fn visit<S>(&mut self, _serializer: &mut S) -> ::std::result::Result<Option<()>, S::Error> fn visit<__S>(&mut self, _serializer: &mut __S) -> ::std::result::Result<Option<()>, __S::Error>
where S: _serde::ser::Serializer where __S: _serde::ser::Serializer
{ {
match self.state { match self.state {
$arms $arms
@ -763,8 +763,8 @@ fn serialize_struct_visitor(
for Visitor $visitor_generics for Visitor $visitor_generics
$where_clause { $where_clause {
#[inline] #[inline]
fn visit<S>(&mut self, _serializer: &mut S) -> ::std::result::Result<Option<()>, S::Error> fn visit<__S>(&mut self, _serializer: &mut __S) -> ::std::result::Result<Option<()>, __S::Error>
where S: _serde::ser::Serializer, where __S: _serde::ser::Serializer,
{ {
loop { loop {
match self.state { match self.state {