diff options
Diffstat (limited to 'src/ser')
| -rw-r--r-- | src/ser/mod.rs | 45 | ||||
| -rw-r--r-- | src/ser/pair.rs | 263 |
2 files changed, 30 insertions, 278 deletions
diff --git a/src/ser/mod.rs b/src/ser/mod.rs index f36be4f..4b8f484 100644 --- a/src/ser/mod.rs +++ b/src/ser/mod.rs @@ -1,7 +1,6 @@ //! Serialization support for the `application/x-www-form-urlencoded` format. mod key; -mod pair; mod part; mod value; @@ -13,19 +12,34 @@ use std::str; use url::form_urlencoded::Serializer as UrlEncodedSerializer; use url::form_urlencoded::Target as UrlEncodedTarget; + + + /// Serializes a value into a `application/x-wwww-url-encoded` `String` buffer. /// /// ``` -/// let meal = &[ -/// ("bread", "baguette"), -/// ("cheese", "comté"), -/// ("meat", "ham"), -/// ("fat", "butter"), -/// ]; +/// # #[macro_use] +/// # extern crate serde_derive; +/// # extern crate serde_qs; +/// #[derive(Deserialize, Serialize)] +/// struct Query { +/// name: String, +/// age: u8, +/// occupation: String, +/// } +/// +/// # fn main(){ +/// let q = Query { +/// name: "Alice".to_owned(), +/// age: 24, +/// occupation: "Student".to_owned(), +/// }; +/// /// /// assert_eq!( -/// serde_urlencoded::to_string(meal), -/// Ok("bread=baguette&cheese=comt%C3%A9&meat=ham&fat=butter".to_owned())); +/// serde_qs::to_string(&q), +/// Ok("name=Alice&age=24&occupation=Student".to_owned())); +/// # } /// ``` pub fn to_string<T: ser::Serialize>(input: &T) -> Result<String, Error> { let mut urlencoder = UrlEncodedSerializer::new("".to_owned()); @@ -93,8 +107,8 @@ impl ser::Error for Error { } /// Sequence serializer. -pub struct SeqSerializer<'output, Target: 'output + UrlEncodedTarget> { - urlencoder: &'output mut UrlEncodedSerializer<Target>, +pub struct SeqSerializer<'output, T: 'output + UrlEncodedTarget> { + inner: ser::Impossible<&'output mut UrlEncodedSerializer<T>, Error>, } /// Tuple serializer. @@ -277,14 +291,14 @@ impl<'output, Target> ser::Serializer for Serializer<'output, Target> fn serialize_seq(self, _len: Option<usize>) -> Result<Self::SerializeSeq, Error> { - Ok(SeqSerializer { urlencoder: self.urlencoder }) + Err(Error::top_level()) } /// Serializes a sequence, given length is ignored. fn serialize_seq_fixed_size(self, _len: usize) -> Result<Self::SerializeSeq, Error> { - Ok(SeqSerializer { urlencoder: self.urlencoder }) + Err(Error::top_level()) } /// Returns an error. @@ -352,14 +366,15 @@ impl<'output, Target> ser::SerializeSeq for SeqSerializer<'output, Target> fn serialize_element<T: ?Sized + ser::Serialize>(&mut self, value: &T) -> Result<(), Error> { - value.serialize(pair::PairSerializer::new(self.urlencoder)) + self.inner.serialize_element(value) } fn end(self) -> Result<Self::Ok, Error> { - Ok(self.urlencoder) + self.inner.end() } } + impl<'output, Target> ser::SerializeTuple for TupleSerializer<'output, Target> where Target: 'output + UrlEncodedTarget, { diff --git a/src/ser/pair.rs b/src/ser/pair.rs deleted file mode 100644 index 6815647..0000000 --- a/src/ser/pair.rs +++ /dev/null @@ -1,263 +0,0 @@ -use ser::Error; -use ser::key::KeySink; -use ser::part::PartSerializer; -use ser::value::ValueSink; -use serde::ser; -use std::borrow::Cow; -use std::mem; -use url::form_urlencoded::Serializer as UrlEncodedSerializer; -use url::form_urlencoded::Target as UrlEncodedTarget; - -pub struct PairSerializer<'target, Target: 'target + UrlEncodedTarget> { - urlencoder: &'target mut UrlEncodedSerializer<Target>, - state: PairState, -} - -impl<'target, Target> PairSerializer<'target, Target> - where Target: 'target + UrlEncodedTarget, -{ - pub fn new(urlencoder: &'target mut UrlEncodedSerializer<Target>) -> Self { - PairSerializer { - urlencoder: urlencoder, - state: PairState::WaitingForKey, - } - } -} - -impl<'target, Target> ser::Serializer for PairSerializer<'target, Target> - where Target: 'target + UrlEncodedTarget, -{ - type Ok = (); - type Error = Error; - type SerializeSeq = ser::Impossible<(), Error>; - type SerializeTuple = Self; - type SerializeTupleStruct = ser::Impossible<(), Error>; - type SerializeTupleVariant = ser::Impossible<(), Error>; - type SerializeMap = ser::Impossible<(), Error>; - type SerializeStruct = ser::Impossible<(), Error>; - type SerializeStructVariant = ser::Impossible<(), Error>; - - fn serialize_bool(self, _v: bool) -> Result<(), Error> { - Err(Error::unsupported_pair()) - } - - fn serialize_i8(self, _v: i8) -> Result<(), Error> { - Err(Error::unsupported_pair()) - } - - fn serialize_i16(self, _v: i16) -> Result<(), Error> { - Err(Error::unsupported_pair()) - } - - fn serialize_i32(self, _v: i32) -> Result<(), Error> { - Err(Error::unsupported_pair()) - } - - fn serialize_i64(self, _v: i64) -> Result<(), Error> { - Err(Error::unsupported_pair()) - } - - fn serialize_u8(self, _v: u8) -> Result<(), Error> { - Err(Error::unsupported_pair()) - } - - fn serialize_u16(self, _v: u16) -> Result<(), Error> { - Err(Error::unsupported_pair()) - } - - fn serialize_u32(self, _v: u32) -> Result<(), Error> { - Err(Error::unsupported_pair()) - } - - fn serialize_u64(self, _v: u64) -> Result<(), Error> { - Err(Error::unsupported_pair()) - } - - fn serialize_f32(self, _v: f32) -> Result<(), Error> { - Err(Error::unsupported_pair()) - } - - fn serialize_f64(self, _v: f64) -> Result<(), Error> { - Err(Error::unsupported_pair()) - } - - fn serialize_char(self, _v: char) -> Result<(), Error> { - Err(Error::unsupported_pair()) - } - - fn serialize_str(self, _value: &str) -> Result<(), Error> { - Err(Error::unsupported_pair()) - } - - fn serialize_bytes(self, _value: &[u8]) -> Result<(), Error> { - Err(Error::unsupported_pair()) - } - - fn serialize_unit(self) -> Result<(), Error> { - Err(Error::unsupported_pair()) - } - - fn serialize_unit_struct(self, _name: &'static str) -> Result<(), Error> { - Err(Error::unsupported_pair()) - } - - fn serialize_unit_variant(self, - _name: &'static str, - _variant_index: usize, - _variant: &'static str) - -> Result<(), Error> { - Err(Error::unsupported_pair()) - } - - fn serialize_newtype_struct<T: ?Sized + ser::Serialize> - (self, - _name: &'static str, - value: &T) - -> Result<(), Error> { - value.serialize(self) - } - - fn serialize_newtype_variant<T: ?Sized + ser::Serialize> - (self, - _name: &'static str, - _variant_index: usize, - _variant: &'static str, - _value: &T) - -> Result<(), Error> { - Err(Error::unsupported_pair()) - } - - fn serialize_none(self) -> Result<(), Error> { - Ok(()) - } - - fn serialize_some<T: ?Sized + ser::Serialize>(self, - value: &T) - -> Result<(), Error> { - value.serialize(self) - } - - fn serialize_seq(self, - _len: Option<usize>) - -> Result<Self::SerializeSeq, Error> { - Err(Error::unsupported_pair()) - } - - fn serialize_seq_fixed_size(self, - _len: usize) - -> Result<Self::SerializeSeq, Error> { - Err(Error::unsupported_pair()) - } - - fn serialize_tuple(self, len: usize) -> Result<Self, Error> { - if len == 2 { - Ok(self) - } else { - Err(Error::unsupported_pair()) - } - } - - fn serialize_tuple_struct(self, - _name: &'static str, - _len: usize) - -> Result<Self::SerializeTupleStruct, Error> { - Err(Error::unsupported_pair()) - } - - fn serialize_tuple_variant - (self, - _name: &'static str, - _variant_index: usize, - _variant: &'static str, - _len: usize) - -> Result<Self::SerializeTupleVariant, Error> { - Err(Error::unsupported_pair()) - } - - fn serialize_map(self, - _len: Option<usize>) - -> Result<Self::SerializeMap, Error> { - Err(Error::unsupported_pair()) - } - - fn serialize_struct(self, - _name: &'static str, - _len: usize) - -> Result<Self::SerializeStruct, Error> { - Err(Error::unsupported_pair()) - } - - fn serialize_struct_variant - (self, - _name: &'static str, - _variant_index: usize, - _variant: &'static str, - _len: usize) - -> Result<Self::SerializeStructVariant, Error> { - Err(Error::unsupported_pair()) - } -} - -impl<'target, Target> ser::SerializeTuple for PairSerializer<'target, Target> - where Target: 'target + UrlEncodedTarget, -{ - type Ok = (); - type Error = Error; - - fn serialize_element<T: ?Sized + ser::Serialize>(&mut self, - value: &T) - -> Result<(), Error> { - match mem::replace(&mut self.state, PairState::Done) { - PairState::WaitingForKey => { - let key_sink = KeySink::new(|key| Ok(key.into())); - let key_serializer = PartSerializer::new(key_sink); - self.state = PairState::WaitingForValue { - key: value.serialize(key_serializer)?, - }; - Ok(()) - }, - PairState::WaitingForValue { key } => { - let result = { - let value_sink = ValueSink::new(self.urlencoder, &key); - let value_serializer = PartSerializer::new(value_sink); - value.serialize(value_serializer) - }; - if result.is_ok() { - self.state = PairState::Done; - } else { - self.state = PairState::WaitingForValue { key: key }; - } - result - }, - PairState::Done => Err(Error::done()), - } - } - - fn end(self) -> Result<(), Error> { - if let PairState::Done = self.state { - Ok(()) - } else { - Err(Error::not_done()) - } - } -} - -enum PairState { - WaitingForKey, - WaitingForValue { key: Cow<'static, str> }, - Done, -} - -impl Error { - fn done() -> Self { - Error::Custom("this pair has already been serialized".into()) - } - - fn not_done() -> Self { - Error::Custom("this pair has not yet been serialized".into()) - } - - fn unsupported_pair() -> Self { - Error::Custom("unsupported pair".into()) - } -} |