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

Format some where clauses that rustfmt refused to touch

Browse Source
This commit is contained in:
David Tolnay 2017-04-13 23:04:53 -07:00
parent 91a0f248a1
commit 4e2f08cc7a
No known key found for this signature in database
GPG Key ID: F9BA143B95FF6D82
4 changed files with 105 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -78,7 +78,8 @@ macro_rules! visit_integer_method {
($src_ty:ident, $method:ident, $from_method:ident, $group:ident, $group_ty:ident) => { ($src_ty:ident, $method:ident, $from_method:ident, $group:ident, $group_ty:ident) => {
#[inline] #[inline]
fn $method<E>(self, v: $src_ty) -> Result<Self::Value, E> fn $method<E>(self, v: $src_ty) -> Result<Self::Value, E>
where E: Error where
E: Error,
{ {
match FromPrimitive::$from_method(v) { match FromPrimitive::$from_method(v) {
Some(v) => Ok(v), Some(v) => Ok(v),
@ -92,7 +93,8 @@ macro_rules! visit_float_method {
($src_ty:ident, $method:ident) => { ($src_ty:ident, $method:ident) => {
#[inline] #[inline]
fn $method<E>(self, v: $src_ty) -> Result<Self::Value, E> fn $method<E>(self, v: $src_ty) -> Result<Self::Value, E>
where E: Error where
E: Error,
{ {
Ok(v as Self::Value) Ok(v as Self::Value)
} }
@ -104,7 +106,8 @@ macro_rules! impl_deserialize_num {
impl<'de> Deserialize<'de> for $ty { impl<'de> Deserialize<'de> for $ty {
#[inline] #[inline]
fn deserialize<D>(deserializer: D) -> Result<$ty, D::Error> fn deserialize<D>(deserializer: D) -> Result<$ty, D::Error>
where D: Deserializer<'de>, where
D: Deserializer<'de>,
{ {
struct PrimitiveVisitor; struct PrimitiveVisitor;
@ -510,7 +513,8 @@ macro_rules! seq_impl {
} }
impl<'de, T $(, $typaram)*> Visitor<'de> for $visitor_ty<T $(, $typaram)*> impl<'de, T $(, $typaram)*> Visitor<'de> for $visitor_ty<T $(, $typaram)*>
where T: Deserialize<'de>, where
T: Deserialize<'de>,
$($($boundparam: $bound1 $(+ $bound2)*),*)* $($($boundparam: $bound1 $(+ $bound2)*),*)*
{ {
type Value = $ty<T $(, $typaram)*>; type Value = $ty<T $(, $typaram)*>;
@ -521,7 +525,8 @@ macro_rules! seq_impl {
#[inline] #[inline]
fn visit_seq<V>(self, mut $visitor: V) -> Result<Self::Value, V::Error> fn visit_seq<V>(self, mut $visitor: V) -> Result<Self::Value, V::Error>
where V: SeqVisitor<'de>, where
V: SeqVisitor<'de>,
{ {
let mut values = $with_capacity; let mut values = $with_capacity;
@ -534,11 +539,13 @@ macro_rules! seq_impl {
} }
impl<'de, T $(, $typaram)*> Deserialize<'de> for $ty<T $(, $typaram)*> impl<'de, T $(, $typaram)*> Deserialize<'de> for $ty<T $(, $typaram)*>
where T: Deserialize<'de>, where
T: Deserialize<'de>,
$($($boundparam: $bound1 $(+ $bound2)*),*)* $($($boundparam: $bound1 $(+ $bound2)*),*)*
{ {
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
where D: Deserializer<'de>, where
D: Deserializer<'de>,
{ {
deserializer.deserialize_seq($visitor_ty::new()) deserializer.deserialize_seq($visitor_ty::new())
} }
@ -643,7 +650,8 @@ macro_rules! array_impls {
($($len:expr => ($($n:tt $name:ident)+))+) => { ($($len:expr => ($($n:tt $name:ident)+))+) => {
$( $(
impl<'de, T> Visitor<'de> for ArrayVisitor<[T; $len]> impl<'de, T> Visitor<'de> for ArrayVisitor<[T; $len]>
where T: Deserialize<'de> where
T: Deserialize<'de>,
{ {
type Value = [T; $len]; type Value = [T; $len];
@ -653,7 +661,8 @@ macro_rules! array_impls {
#[inline] #[inline]
fn visit_seq<V>(self, mut visitor: V) -> Result<[T; $len], V::Error> fn visit_seq<V>(self, mut visitor: V) -> Result<[T; $len], V::Error>
where V: SeqVisitor<'de>, where
V: SeqVisitor<'de>,
{ {
$( $(
let $name = match try!(visitor.visit()) { let $name = match try!(visitor.visit()) {
@ -667,10 +676,12 @@ macro_rules! array_impls {
} }
impl<'de, T> Deserialize<'de> for [T; $len] impl<'de, T> Deserialize<'de> for [T; $len]
where T: Deserialize<'de>, where
T: Deserialize<'de>,
{ {
fn deserialize<D>(deserializer: D) -> Result<[T; $len], D::Error> fn deserialize<D>(deserializer: D) -> Result<[T; $len], D::Error>
where D: Deserializer<'de>, where
D: Deserializer<'de>,
{ {
deserializer.deserialize_seq_fixed_size($len, ArrayVisitor::<[T; $len]>::new()) deserializer.deserialize_seq_fixed_size($len, ArrayVisitor::<[T; $len]>::new())
} }
@ -739,7 +750,8 @@ macro_rules! tuple_impls {
#[inline] #[inline]
#[allow(non_snake_case)] #[allow(non_snake_case)]
fn visit_seq<V>(self, mut visitor: V) -> Result<($($name,)+), V::Error> fn visit_seq<V>(self, mut visitor: V) -> Result<($($name,)+), V::Error>
where V: SeqVisitor<'de>, where
V: SeqVisitor<'de>,
{ {
$( $(
let $name = match try!(visitor.visit()) { let $name = match try!(visitor.visit()) {
@ -755,7 +767,8 @@ macro_rules! tuple_impls {
impl<'de, $($name: Deserialize<'de>),+> Deserialize<'de> for ($($name,)+) { impl<'de, $($name: Deserialize<'de>),+> Deserialize<'de> for ($($name,)+) {
#[inline] #[inline]
fn deserialize<D>(deserializer: D) -> Result<($($name,)+), D::Error> fn deserialize<D>(deserializer: D) -> Result<($($name,)+), D::Error>
where D: Deserializer<'de>, where
D: Deserializer<'de>,
{ {
deserializer.deserialize_tuple($len, $visitor::new()) deserializer.deserialize_tuple($len, $visitor::new())
} }
@ -806,7 +819,8 @@ macro_rules! map_impl {
} }
impl<'de, K, V $(, $typaram)*> Visitor<'de> for $visitor_ty<K, V $(, $typaram)*> impl<'de, K, V $(, $typaram)*> Visitor<'de> for $visitor_ty<K, V $(, $typaram)*>
where K: Deserialize<'de>, where
K: Deserialize<'de>,
V: Deserialize<'de>, V: Deserialize<'de>,
$($boundparam: $bound1 $(+ $bound2)*),* $($boundparam: $bound1 $(+ $bound2)*),*
{ {
@ -818,7 +832,8 @@ macro_rules! map_impl {
#[inline] #[inline]
fn visit_map<Visitor>(self, mut $visitor: Visitor) -> Result<Self::Value, Visitor::Error> fn visit_map<Visitor>(self, mut $visitor: Visitor) -> Result<Self::Value, Visitor::Error>
where Visitor: MapVisitor<'de>, where
Visitor: MapVisitor<'de>,
{ {
let mut values = $with_capacity; let mut values = $with_capacity;
@ -831,12 +846,14 @@ macro_rules! map_impl {
} }
impl<'de, K, V $(, $typaram)*> Deserialize<'de> for $ty<K, V $(, $typaram)*> impl<'de, K, V $(, $typaram)*> Deserialize<'de> for $ty<K, V $(, $typaram)*>
where K: Deserialize<'de>, where
K: Deserialize<'de>,
V: Deserialize<'de>, V: Deserialize<'de>,
$($boundparam: $bound1 $(+ $bound2)*),* $($boundparam: $bound1 $(+ $bound2)*),*
{ {
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
where D: Deserializer<'de>, where
D: Deserializer<'de>,
{ {
deserializer.deserialize_map($visitor_ty::new()) deserializer.deserialize_map($visitor_ty::new())
} }

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

@ -121,7 +121,8 @@ macro_rules! primitive_deserializer {
} }
impl<'de, E> IntoDeserializer<'de, E> for $ty impl<'de, E> IntoDeserializer<'de, E> for $ty
where E: de::Error, where
E: de::Error,
{ {
type Deserializer = $name<E>; type Deserializer = $name<E>;
@ -134,7 +135,8 @@ macro_rules! primitive_deserializer {
} }
impl<'de, E> de::Deserializer<'de> for $name<E> impl<'de, E> de::Deserializer<'de> for $name<E>
where E: de::Error, where
E: de::Error,
{ {
type Error = E; type Error = E;
@ -145,7 +147,8 @@ macro_rules! primitive_deserializer {
} }
fn deserialize<V>(self, visitor: V) -> Result<V::Value, Self::Error> fn deserialize<V>(self, visitor: V) -> Result<V::Value, Self::Error>
where V: de::Visitor<'de>, where
V: de::Visitor<'de>,
{ {
visitor.$method(self.value $($cast)*) visitor.$method(self.value $($cast)*)
} }
@ -700,16 +703,18 @@ where
} }
impl<'de, I, E> de::Deserializer<'de> for MapDeserializer<'de, I, E> impl<'de, I, E> de::Deserializer<'de> for MapDeserializer<'de, I, E>
where I: Iterator, where
I: Iterator,
I::Item: private::Pair, I::Item: private::Pair,
First<I::Item>: IntoDeserializer<'de, E>, First<I::Item>: IntoDeserializer<'de, E>,
Second<I::Item>: IntoDeserializer<'de, E>, Second<I::Item>: IntoDeserializer<'de, E>,
E: de::Error E: de::Error,
{ {
type Error = E; type Error = E;
fn deserialize<V_>(mut self, visitor: V_) -> Result<V_::Value, Self::Error> fn deserialize<V_>(mut self, visitor: V_) -> Result<V_::Value, Self::Error>
where V_: de::Visitor<'de> where
V_: de::Visitor<'de>,
{ {
let value = try!(visitor.visit_map(&mut self)); let value = try!(visitor.visit_map(&mut self));
try!(self.end()); try!(self.end());
@ -717,7 +722,8 @@ impl<'de, I, E> de::Deserializer<'de> for MapDeserializer<'de, I, E>
} }
fn deserialize_seq<V_>(mut self, visitor: V_) -> Result<V_::Value, Self::Error> fn deserialize_seq<V_>(mut self, visitor: V_) -> Result<V_::Value, Self::Error>
where V_: de::Visitor<'de> where
V_: de::Visitor<'de>,
{ {
let value = try!(visitor.visit_seq(&mut self)); let value = try!(visitor.visit_seq(&mut self));
try!(self.end()); try!(self.end());
@ -728,7 +734,8 @@ impl<'de, I, E> de::Deserializer<'de> for MapDeserializer<'de, I, E>
_len: usize, _len: usize,
visitor: V_) visitor: V_)
-> Result<V_::Value, Self::Error> -> Result<V_::Value, Self::Error>
where V_: de::Visitor<'de> where
V_: de::Visitor<'de>,
{ {
self.deserialize_seq(visitor) self.deserialize_seq(visitor)
} }
@ -741,16 +748,18 @@ impl<'de, I, E> de::Deserializer<'de> for MapDeserializer<'de, I, E>
} }
impl<'de, I, E> de::MapVisitor<'de> for MapDeserializer<'de, I, E> impl<'de, I, E> de::MapVisitor<'de> for MapDeserializer<'de, I, E>
where I: Iterator, where
I: Iterator,
I::Item: private::Pair, I::Item: private::Pair,
First<I::Item>: IntoDeserializer<'de, E>, First<I::Item>: IntoDeserializer<'de, E>,
Second<I::Item>: IntoDeserializer<'de, E>, Second<I::Item>: IntoDeserializer<'de, E>,
E: de::Error E: de::Error,
{ {
type Error = E; type Error = E;
fn visit_key_seed<T>(&mut self, seed: T) -> Result<Option<T::Value>, Self::Error> fn visit_key_seed<T>(&mut self, seed: T) -> Result<Option<T::Value>, Self::Error>
where T: de::DeserializeSeed<'de> where
T: de::DeserializeSeed<'de>,
{ {
match self.next_pair() { match self.next_pair() {
Some((key, value)) => { Some((key, value)) => {
@ -762,7 +771,8 @@ impl<'de, I, E> de::MapVisitor<'de> for MapDeserializer<'de, I, E>
} }
fn visit_value_seed<T>(&mut self, seed: T) -> Result<T::Value, Self::Error> fn visit_value_seed<T>(&mut self, seed: T) -> Result<T::Value, Self::Error>
where T: de::DeserializeSeed<'de> where
T: de::DeserializeSeed<'de>,
{ {
let value = self.value.take(); let value = self.value.take();
// Panic because this indicates a bug in the program rather than an // Panic because this indicates a bug in the program rather than an
@ -775,8 +785,9 @@ impl<'de, I, E> de::MapVisitor<'de> for MapDeserializer<'de, I, E>
kseed: TK, kseed: TK,
vseed: TV) vseed: TV)
-> Result<Option<(TK::Value, TV::Value)>, Self::Error> -> Result<Option<(TK::Value, TV::Value)>, Self::Error>
where TK: de::DeserializeSeed<'de>, where
TV: de::DeserializeSeed<'de> TK: de::DeserializeSeed<'de>,
TV: de::DeserializeSeed<'de>,
{ {
match self.next_pair() { match self.next_pair() {
Some((key, value)) => { Some((key, value)) => {
@ -794,16 +805,18 @@ impl<'de, I, E> de::MapVisitor<'de> for MapDeserializer<'de, I, E>
} }
impl<'de, I, E> de::SeqVisitor<'de> for MapDeserializer<'de, I, E> impl<'de, I, E> de::SeqVisitor<'de> for MapDeserializer<'de, I, E>
where I: Iterator, where
I: Iterator,
I::Item: private::Pair, I::Item: private::Pair,
First<I::Item>: IntoDeserializer<'de, E>, First<I::Item>: IntoDeserializer<'de, E>,
Second<I::Item>: IntoDeserializer<'de, E>, Second<I::Item>: IntoDeserializer<'de, E>,
E: de::Error E: de::Error,
{ {
type Error = E; type Error = E;
fn visit_seed<T>(&mut self, seed: T) -> Result<Option<T::Value>, Self::Error> fn visit_seed<T>(&mut self, seed: T) -> Result<Option<T::Value>, Self::Error>
where T: de::DeserializeSeed<'de> where
T: de::DeserializeSeed<'de>,
{ {
match self.next_pair() { match self.next_pair() {
Some((k, v)) => { Some((k, v)) => {
@ -823,11 +836,12 @@ impl<'de, I, E> de::SeqVisitor<'de> for MapDeserializer<'de, I, E>
// //
// <I::Item as private::Pair>::Second: Clone // <I::Item as private::Pair>::Second: Clone
impl<'de, I, E> Clone for MapDeserializer<'de, I, E> impl<'de, I, E> Clone for MapDeserializer<'de, I, E>
where I: Iterator + Clone, where
I: Iterator + Clone,
I::Item: private::Pair, I::Item: private::Pair,
First<I::Item>: IntoDeserializer<'de, E>, First<I::Item>: IntoDeserializer<'de, E>,
Second<I::Item>: IntoDeserializer<'de, E> + Clone, Second<I::Item>: IntoDeserializer<'de, E> + Clone,
E: de::Error E: de::Error,
{ {
fn clone(&self) -> Self { fn clone(&self) -> Self {
MapDeserializer { MapDeserializer {
@ -844,11 +858,12 @@ impl<'de, I, E> Clone for MapDeserializer<'de, I, E>
// //
// <I::Item as private::Pair>::Second: Debug // <I::Item as private::Pair>::Second: Debug
impl<'de, I, E> Debug for MapDeserializer<'de, I, E> impl<'de, I, E> Debug for MapDeserializer<'de, I, E>
where I: Iterator + Debug, where
I: Iterator + Debug,
I::Item: private::Pair, I::Item: private::Pair,
First<I::Item>: IntoDeserializer<'de, E>, First<I::Item>: IntoDeserializer<'de, E>,
Second<I::Item>: IntoDeserializer<'de, E> + Debug, Second<I::Item>: IntoDeserializer<'de, E> + Debug,
E: de::Error E: de::Error,
{ {
fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result { fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
formatter.debug_struct("MapDeserializer") formatter.debug_struct("MapDeserializer")

3
serde/src/macros.rs
View File

@ -141,7 +141,8 @@ macro_rules! forward_to_deserialize_method {
($func:ident<$l:tt, $v:ident>($($arg:ident : $ty:ty),*)) => { ($func:ident<$l:tt, $v:ident>($($arg:ident : $ty:ty),*)) => {
#[inline] #[inline]
fn $func<$v>(self, $($arg: $ty,)* visitor: $v) -> $crate::export::Result<$v::Value, Self::Error> fn $func<$v>(self, $($arg: $ty,)* visitor: $v) -> $crate::export::Result<$v::Value, Self::Error>
where $v: $crate::de::Visitor<$l> where
$v: $crate::de::Visitor<$l>,
{ {
$( $(
let _ = $arg; let _ = $arg;

17
serde/src/ser/impls.rs
View File

@ -137,10 +137,14 @@ impl<T> Serialize for [T; 0] {
macro_rules! array_impls { macro_rules! array_impls {
($($len:tt)+) => { ($($len:tt)+) => {
$( $(
impl<T> Serialize for [T; $len] where T: Serialize { impl<T> Serialize for [T; $len]
where
T: Serialize,
{
#[inline] #[inline]
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error> fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
where S: Serializer, where
S: Serializer,
{ {
let mut seq = try!(serializer.serialize_seq_fixed_size($len)); let mut seq = try!(serializer.serialize_seq_fixed_size($len));
for e in self { for e in self {
@ -166,7 +170,8 @@ where
{ {
#[inline] #[inline]
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error> fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
where S: Serializer, where
S: Serializer,
{ {
serializer.collect_seq(self) serializer.collect_seq(self)
} }
@ -181,7 +186,8 @@ macro_rules! seq_impl {
{ {
#[inline] #[inline]
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error> fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
where S: Serializer, where
S: Serializer,
{ {
serializer.collect_seq(self) serializer.collect_seq(self)
} }
@ -294,7 +300,8 @@ macro_rules! map_impl {
{ {
#[inline] #[inline]
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error> fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
where S: Serializer, where
S: Serializer,
{ {
serializer.collect_seq(self) serializer.collect_seq(self)
} }