diff options
Diffstat (limited to 'src/ser')
| -rw-r--r-- | src/ser/key.rs | 30 | ||||
| -rw-r--r-- | src/ser/mod.rs | 13 | ||||
| -rw-r--r-- | src/ser/part.rs | 16 | ||||
| -rw-r--r-- | src/ser/value.rs | 11 |
4 files changed, 35 insertions, 35 deletions
diff --git a/src/ser/key.rs b/src/ser/key.rs index 5b2ccdd..10f1fff 100644 --- a/src/ser/key.rs +++ b/src/ser/key.rs @@ -1,7 +1,7 @@ -use ser::{Error}; -use serde::ser::{SerializeSeq, SerializeStruct}; +use ser::Error; use ser::part::Sink; use serde::Serialize; +use serde::ser::{SerializeSeq, SerializeStruct}; use std::borrow::Cow; use std::ops::Deref; @@ -35,7 +35,7 @@ pub struct KeySink<End> { } impl<End, Ok> KeySink<End> - where End: for<'key> FnOnce(Key<'key>) -> Result<Ok, Error> + where End: for<'key> FnOnce(Key<'key>) -> Result<Ok, Error>, { pub fn new(end: End) -> Self { KeySink { end: end } @@ -43,12 +43,9 @@ impl<End, Ok> KeySink<End> } impl<End, Ok> Sink<Ok, Error> for KeySink<End> - where End: for<'key> FnOnce(Key<'key>) -> Result<Ok, Error> + where End: for<'key> FnOnce(Key<'key>) -> Result<Ok, Error>, { - - fn serialize_static_str(self, - value: &'static str) - -> Result<Ok, Error> { + fn serialize_static_str(self, value: &'static str) -> Result<Ok, Error> { (self.end)(Key::Static(value)) } @@ -76,15 +73,15 @@ impl<End, Ok> Sink<Ok, Error> for KeySink<End> } impl<End, Ok> SerializeStruct for KeySink<End> -where End: for<'key> FnOnce(Key<'key>) -> Result<Ok, Error> + where End: for<'key> FnOnce(Key<'key>) -> Result<Ok, Error>, { type Ok = Ok; type Error = Error; fn serialize_field<T: ?Sized + Serialize>(&mut self, - _key: &'static str, - _value: &T) - -> Result<(), Error> { + _key: &'static str, + _value: &T) + -> Result<(), Error> { Err(self.unsupported()) } @@ -94,14 +91,14 @@ where End: for<'key> FnOnce(Key<'key>) -> Result<Ok, Error> } impl<End, Ok> SerializeSeq for KeySink<End> -where End: for<'key> FnOnce(Key<'key>) -> Result<Ok, Error> + where End: for<'key> FnOnce(Key<'key>) -> Result<Ok, Error>, { type Ok = Ok; type Error = Error; fn serialize_element<T: ?Sized + Serialize>(&mut self, - _value: &T) - -> Result<(), Error> { + _value: &T) + -> Result<(), Error> { Err(self.unsupported()) } @@ -109,6 +106,3 @@ where End: for<'key> FnOnce(Key<'key>) -> Result<Ok, Error> Err(self.unsupported()) } } - - - diff --git a/src/ser/mod.rs b/src/ser/mod.rs index f732bb3..67ed046 100644 --- a/src/ser/mod.rs +++ b/src/ser/mod.rs @@ -22,14 +22,14 @@ use url::form_urlencoded::Target as UrlEncodedTarget; /// struct Query { /// name: String, /// age: u8, -/// occupation: String, +/// occupation: String, /// } /// /// # fn main(){ /// let q = Query { /// name: "Alice".to_owned(), /// age: 24, -/// occupation: "Student".to_owned(), +/// occupation: "Student".to_owned(), /// }; /// /// @@ -389,7 +389,8 @@ impl<'output, Target> ser::SerializeTuple for TupleSerializer<'output, Target> } impl<'output, Target> ser::SerializeTupleStruct - for TupleStructSerializer<'output, Target> + for + TupleStructSerializer<'output, Target> where Target: 'output + UrlEncodedTarget, { type Ok = &'output mut UrlEncodedSerializer<Target>; @@ -407,7 +408,8 @@ impl<'output, Target> ser::SerializeTupleStruct } impl<'output, Target> ser::SerializeTupleVariant - for TupleVariantSerializer<'output, Target> + for + TupleVariantSerializer<'output, Target> where Target: 'output + UrlEncodedTarget, { type Ok = &'output mut UrlEncodedSerializer<Target>; @@ -491,7 +493,8 @@ impl<'output, Target> ser::SerializeStruct for StructSerializer<'output, Target> } impl<'output, Target> ser::SerializeStructVariant - for StructVariantSerializer<'output, Target> + for + StructVariantSerializer<'output, Target> where Target: 'output + UrlEncodedTarget, { type Ok = &'output mut UrlEncodedSerializer<Target>; diff --git a/src/ser/part.rs b/src/ser/part.rs index 4cf90b3..949af61 100644 --- a/src/ser/part.rs +++ b/src/ser/part.rs @@ -1,10 +1,10 @@ use dtoa; use itoa; use ser::Error; -use serde::ser; use serde; -use std::str; +use serde::ser; use std::marker::PhantomData; +use std::str; pub struct PartSerializer<SO, S: Sink<SO, Error>> { sink: S, @@ -13,15 +13,19 @@ pub struct PartSerializer<SO, S: Sink<SO, Error>> { impl<SO, S: Sink<SO, Error>> PartSerializer<SO, S> { pub fn new(sink: S) -> Self { - PartSerializer { sink: sink, marker: PhantomData } + PartSerializer { + sink: sink, + marker: PhantomData, + } } } -pub trait Sink<S, E>: Sized + ser::SerializeStruct<Ok=S, Error=E> + ser::SerializeSeq<Ok=S, Error=E> +pub trait Sink<S, E>: Sized + ser::SerializeStruct<Ok=S, Error=E> + + ser::SerializeSeq<Ok=S, Error=E> where E: serde::ser::Error { - // type Ok; - // type Error; +// type Ok; +// type Error; fn serialize_static_str(self, value: &'static str) -> Result<S, Error>; diff --git a/src/ser/value.rs b/src/ser/value.rs index 5ed80b9..f2fc617 100644 --- a/src/ser/value.rs +++ b/src/ser/value.rs @@ -68,9 +68,9 @@ impl<'key, 'target, Target> SerializeStruct for ValueSink<'key, 'target, Target> type Error = Error; fn serialize_field<T: ?Sized + Serialize>(&mut self, - key: &'static str, - value: &T) - -> Result<(), Error> { + key: &'static str, + value: &T) + -> Result<(), Error> { let newk = format!("{}[{}]", self.key, key); let value_sink = ValueSink::new(self.urlencoder, &newk); value.serialize(super::part::PartSerializer::new(value_sink)) @@ -88,8 +88,8 @@ impl<'key, 'target, Target> SerializeSeq for ValueSink<'key, 'target, Target> type Error = Error; fn serialize_element<T: ?Sized + Serialize>(&mut self, - value: &T) - -> Result<(), Error> { + value: &T) + -> Result<(), Error> { let newk = format!("{}[{}]", self.key, self.idx); self.idx += 1; let value_sink = ValueSink::new(self.urlencoder, &newk); @@ -100,4 +100,3 @@ impl<'key, 'target, Target> SerializeSeq for ValueSink<'key, 'target, Target> Ok(()) } } - |