summaryrefslogtreecommitdiff
path: root/src/ser/pair.rs
diff options
context:
space:
mode:
Diffstat (limited to 'src/ser/pair.rs')
-rw-r--r--src/ser/pair.rs428
1 files changed, 235 insertions, 193 deletions
diff --git a/src/ser/pair.rs b/src/ser/pair.rs
index 36eda51..3d91637 100644
--- a/src/ser/pair.rs
+++ b/src/ser/pair.rs
@@ -1,111 +1,107 @@
-use ser::{Error, key, value};
-use serde::{Serialize, Serializer};
+use ser::Error;
+use ser::key::KeySink;
+use ser::part::PartSerializer;
+use ser::value::ValueSink;
+use serde::ser;
use std::borrow::Cow;
-use url::form_urlencoded;
+use std::mem;
+use url::form_urlencoded::Serializer as UrlEncodedSerializer;
+use url::form_urlencoded::Target as UrlEncodedTarget;
-pub struct PairSerializer<'target, Target>(
- &'target mut form_urlencoded::Serializer<Target>)
- where Target: 'target + form_urlencoded::Target;
+pub struct PairSerializer<'target, Target: 'target + UrlEncodedTarget> {
+ urlencoder: &'target mut UrlEncodedSerializer<Target>,
+ state: PairState,
+}
impl<'target, Target> PairSerializer<'target, Target>
- where Target: 'target + form_urlencoded::Target,
+ where Target: 'target + UrlEncodedTarget,
{
- pub fn new(serializer: &'target mut form_urlencoded::Serializer<Target>)
- -> Self {
- PairSerializer(serializer)
+ pub fn new(urlencoder: &'target mut UrlEncodedSerializer<Target>) -> Self {
+ PairSerializer {
+ urlencoder: urlencoder,
+ state: PairState::WaitingForKey,
+ }
}
}
-pub struct TupleState(Option<Option<Cow<'static, str>>>);
-pub struct TupleStructState(TupleState);
-
-impl<'target, Target> Serializer for PairSerializer<'target, Target>
- where Target: 'target + form_urlencoded::Target,
+impl<'target, Target> ser::Serializer for PairSerializer<'target, Target>
+ where Target: 'target + UrlEncodedTarget,
{
+ type Ok = ();
type Error = Error;
- type SeqState = ();
- type TupleState = TupleState;
- type TupleStructState = TupleStructState;
- type TupleVariantState = ();
- type MapState = ();
- type StructState = ();
- type StructVariantState = ();
-
- fn serialize_bool(&mut self, _v: bool) -> Result<(), Error> {
- Err(Error::Custom("booleans are not supported values".into()))
- }
-
- fn serialize_isize(&mut self, _v: isize) -> Result<(), Error> {
- Err(Error::unsupported_pair())
- }
+ type SerializeSeq = Self;
+ type SerializeTuple = Self;
+ type SerializeTupleStruct = Self;
+ type SerializeTupleVariant = Self;
+ type SerializeMap = Self;
+ type SerializeStruct = Self;
+ type SerializeStructVariant = Self;
- fn serialize_i8(&mut self, _v: i8) -> Result<(), Error> {
+ fn serialize_bool(self, _v: bool) -> Result<(), Error> {
Err(Error::unsupported_pair())
}
- fn serialize_i16(&mut self, _v: i16) -> Result<(), Error> {
+ fn serialize_i8(self, _v: i8) -> Result<(), Error> {
Err(Error::unsupported_pair())
}
- fn serialize_i32(&mut self, _v: i32) -> Result<(), Error> {
+ fn serialize_i16(self, _v: i16) -> Result<(), Error> {
Err(Error::unsupported_pair())
}
- fn serialize_i64(&mut self, _v: i64) -> Result<(), Error> {
+ fn serialize_i32(self, _v: i32) -> Result<(), Error> {
Err(Error::unsupported_pair())
}
- fn serialize_usize(&mut self, _v: usize) -> Result<(), Error> {
+ fn serialize_i64(self, _v: i64) -> Result<(), Error> {
Err(Error::unsupported_pair())
}
- fn serialize_u8(&mut self, _v: u8) -> Result<(), Error> {
+ fn serialize_u8(self, _v: u8) -> Result<(), Error> {
Err(Error::unsupported_pair())
}
- fn serialize_u16(&mut self, _v: u16) -> Result<(), Error> {
+ fn serialize_u16(self, _v: u16) -> Result<(), Error> {
Err(Error::unsupported_pair())
}
- fn serialize_u32(&mut self, _v: u32) -> Result<(), Error> {
+ fn serialize_u32(self, _v: u32) -> Result<(), Error> {
Err(Error::unsupported_pair())
}
- fn serialize_u64(&mut self, _v: u64) -> Result<(), Error> {
+ fn serialize_u64(self, _v: u64) -> Result<(), Error> {
Err(Error::unsupported_pair())
}
- fn serialize_f32(&mut self, _v: f32) -> Result<(), Error> {
+ fn serialize_f32(self, _v: f32) -> Result<(), Error> {
Err(Error::unsupported_pair())
}
- fn serialize_f64(&mut self, _v: f64) -> Result<(), Error> {
+ fn serialize_f64(self, _v: f64) -> Result<(), Error> {
Err(Error::unsupported_pair())
}
- fn serialize_char(&mut self, _v: char) -> Result<(), Error> {
+ fn serialize_char(self, _v: char) -> Result<(), Error> {
Err(Error::unsupported_pair())
}
- fn serialize_str(&mut self, _value: &str) -> Result<(), Error> {
+ fn serialize_str(self, _value: &str) -> Result<(), Error> {
Err(Error::unsupported_pair())
}
- fn serialize_bytes(&mut self, _value: &[u8]) -> Result<(), Error> {
+ fn serialize_bytes(self, _value: &[u8]) -> Result<(), Error> {
Err(Error::unsupported_pair())
}
- fn serialize_unit(&mut self) -> Result<(), Error> {
+ fn serialize_unit(self) -> Result<(), Error> {
Err(Error::unsupported_pair())
}
- fn serialize_unit_struct(&mut self,
- _name: &'static str)
- -> Result<(), Error> {
+ fn serialize_unit_struct(self, _name: &'static str) -> Result<(), Error> {
Err(Error::unsupported_pair())
}
- fn serialize_unit_variant(&mut self,
+ fn serialize_unit_variant(self,
_name: &'static str,
_variant_index: usize,
_variant: &'static str)
@@ -113,213 +109,259 @@ impl<'target, Target> Serializer for PairSerializer<'target, Target>
Err(Error::unsupported_pair())
}
- fn serialize_newtype_struct<T>(&mut self,
- _name: &'static str,
- value: T)
- -> Result<(), Error>
- where T: Serialize,
- {
+ fn serialize_newtype_struct<T: ?Sized + ser::Serialize>
+ (self,
+ _name: &'static str,
+ value: &T)
+ -> Result<(), Error> {
value.serialize(self)
}
- fn serialize_newtype_variant<T>(&mut self,
- _name: &'static str,
- _variant_index: usize,
- _variant: &'static str,
- _value: T)
- -> Result<(), Error>
- where T: Serialize,
- {
+ 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(&mut self) -> Result<(), Error> {
+ fn serialize_none(self) -> Result<(), Error> {
Ok(())
}
- fn serialize_some<T>(&mut self, value: T) -> Result<(), Error>
- where T: Serialize,
- {
+ fn serialize_some<T: ?Sized + ser::Serialize>(self,
+ value: &T)
+ -> Result<(), Error> {
value.serialize(self)
}
- fn serialize_seq(&mut self, _len: Option<usize>) -> Result<(), Error> {
+ fn serialize_seq(self, _len: Option<usize>) -> Result<Self, Error> {
Err(Error::unsupported_pair())
}
- fn serialize_seq_elt<T>(&mut self,
- _state: &mut (),
- _value: T)
- -> Result<(), Error>
- where T: Serialize,
- {
+ fn serialize_seq_fixed_size(self, _len: usize) -> Result<Self, Error> {
Err(Error::unsupported_pair())
}
- fn serialize_seq_end(&mut self, _state: ()) -> Result<(), Error> {
+ 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, Error> {
Err(Error::unsupported_pair())
}
- fn serialize_seq_fixed_size(&mut self, _size: usize) -> Result<(), Error> {
+ fn serialize_tuple_variant(self,
+ _name: &'static str,
+ _variant_index: usize,
+ _variant: &'static str,
+ _len: usize)
+ -> Result<Self, Error> {
Err(Error::unsupported_pair())
}
- fn serialize_tuple(&mut self, len: usize) -> Result<TupleState, Error> {
- if len == 2 {
- Ok(TupleState(None))
- } else {
- Err(Error::unsupported_pair())
- }
+ fn serialize_map(self, _len: Option<usize>) -> Result<Self, Error> {
+ Err(Error::unsupported_pair())
}
- fn serialize_tuple_elt<T>(&mut self,
- state: &mut TupleState,
- value: T)
- -> Result<(), Error>
- where T: Serialize,
- {
- match state.0.take() {
- None => {
- let mut key = None;
- {
- let mut key_serializer =
- key::MapKeySerializer::new(&mut key);
- value.serialize(&mut key_serializer)?;
- }
- state.0 = Some(key);
+ fn serialize_struct(self,
+ _name: &'static str,
+ _len: usize)
+ -> Result<Self, Error> {
+ Err(Error::unsupported_pair())
+ }
+
+ fn serialize_struct_variant(self,
+ _name: &'static str,
+ _variant_index: usize,
+ _variant: &'static str,
+ _len: usize)
+ -> Result<Self, Error> {
+ Err(Error::unsupported_pair())
+ }
+}
+
+impl<'target, Target> ser::SerializeSeq 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> {
+ unreachable!()
+ }
+
+ fn end(self) -> Result<(), Error> {
+ unreachable!()
+ }
+}
+
+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(())
},
- Some(ref mut key) => {
- {
- let mut value_serializer =
- value::ValueSerializer::new(key, &mut self.0).unwrap();
- value.serialize(&mut value_serializer)?;
+ 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 };
}
- state.0 = Some(None);
- Ok(())
+ result
},
+ PairState::Done => Err(Error::done()),
}
}
- fn serialize_tuple_end(&mut self, _state: TupleState) -> Result<(), Error> {
- Ok(())
+ fn end(self) -> Result<(), Error> {
+ if let PairState::Done = self.state {
+ Ok(())
+ } else {
+ Err(Error::not_done())
+ }
}
+}
- fn serialize_tuple_struct(&mut self,
- _name: &'static str,
- len: usize)
- -> Result<TupleStructState, Error> {
- self.serialize_tuple(len).map(TupleStructState)
- }
+impl<'target, Target> ser::SerializeTupleStruct
+ for PairSerializer<'target, Target>
+ where Target: 'target + UrlEncodedTarget,
+{
+ type Ok = ();
+ type Error = Error;
- fn serialize_tuple_struct_elt<T>(&mut self,
- state: &mut TupleStructState,
- value: T)
- -> Result<(), Error>
- where T: Serialize,
- {
- self.serialize_tuple_elt(&mut state.0, value)
+ fn serialize_field<T: ?Sized + ser::Serialize>(&mut self,
+ _value: &T)
+ -> Result<(), Error> {
+ unreachable!()
}
- fn serialize_tuple_struct_end(&mut self,
- _state: TupleStructState)
- -> Result<(), Error> {
- Ok(())
+ fn end(self) -> Result<(), Error> {
+ unreachable!()
}
+}
- fn serialize_tuple_variant(&mut self,
- _name: &'static str,
- _variant_index: usize,
- _variant: &'static str,
- _len: usize)
- -> Result<(), Error> {
- Err(Error::unsupported_pair())
- }
+impl<'target, Target> ser::SerializeTupleVariant
+ for PairSerializer<'target, Target>
+ where Target: 'target + UrlEncodedTarget,
+{
+ type Ok = ();
+ type Error = Error;
- fn serialize_tuple_variant_elt<T>(&mut self,
- _state: &mut (),
- _value: T)
- -> Result<(), Error>
- where T: Serialize,
- {
- Err(Error::unsupported_pair())
+ fn serialize_field<T: ?Sized + ser::Serialize>(&mut self,
+ _value: &T)
+ -> Result<(), Error> {
+ unreachable!()
}
- fn serialize_tuple_variant_end(&mut self, _state: ()) -> Result<(), Error> {
- Err(Error::unsupported_pair())
+ fn end(self) -> Result<(), Error> {
+ unreachable!()
}
+}
- fn serialize_map(&mut self, _len: Option<usize>) -> Result<(), Error> {
- Err(Error::unsupported_pair())
- }
+impl<'target, Target> ser::SerializeMap for PairSerializer<'target, Target>
+ where Target: 'target + UrlEncodedTarget,
+{
+ type Ok = ();
+ type Error = Error;
- fn serialize_map_key<T>(&mut self,
- _state: &mut (),
- _key: T)
- -> Result<(), Error>
- where T: Serialize,
- {
- Err(Error::unsupported_pair())
+ fn serialize_key<T: ?Sized + ser::Serialize>(&mut self,
+ _key: &T)
+ -> Result<(), Error> {
+ unreachable!()
}
- fn serialize_map_value<T>(&mut self,
- _state: &mut (),
- _value: T)
- -> Result<(), Error>
- where T: Serialize,
- {
- Err(Error::unsupported_pair())
+ fn serialize_value<T: ?Sized + ser::Serialize>(&mut self,
+ _value: &T)
+ -> Result<(), Error> {
+ unreachable!()
}
- fn serialize_map_end(&mut self, _state: ()) -> Result<(), Error> {
- Err(Error::unsupported_pair())
+ fn end(self) -> Result<(), Error> {
+ unreachable!()
}
+}
- fn serialize_struct(&mut self,
- _name: &'static str,
- _len: usize)
- -> Result<(), Error> {
- Err(Error::unsupported_pair())
- }
+impl<'target, Target> ser::SerializeStruct for PairSerializer<'target, Target>
+ where Target: 'target + UrlEncodedTarget,
+{
+ type Ok = ();
+ type Error = Error;
- fn serialize_struct_elt<T>(&mut self,
- _state: &mut (),
- _key: &'static str,
- _value: T)
- -> Result<(), Error>
- where T: Serialize,
- {
- Err(Error::unsupported_pair())
+ fn serialize_field<T: ?Sized + ser::Serialize>(&mut self,
+ _key: &'static str,
+ _value: &T)
+ -> Result<(), Error> {
+ unreachable!()
}
- fn serialize_struct_end(&mut self, _state: ()) -> Result<(), Error> {
- Err(Error::unsupported_pair())
+ fn end(self) -> Result<(), Error> {
+ unreachable!()
}
+}
- fn serialize_struct_variant(&mut self,
- _name: &'static str,
- _variant_index: usize,
- _variant: &'static str,
- _len: usize)
- -> Result<(), Error> {
- Err(Error::unsupported_pair())
- }
- fn serialize_struct_variant_elt<T>(&mut self,
- _state: &mut (),
- _key: &'static str,
- _value: T)
- -> Result<(), Error> {
- Err(Error::unsupported_pair())
+impl<'target, Target> ser::SerializeStructVariant
+ for PairSerializer<'target, Target>
+ where Target: 'target + UrlEncodedTarget,
+{
+ type Ok = ();
+ type Error = Error;
+
+ fn serialize_field<T: ?Sized + ser::Serialize>(&mut self,
+ _key: &'static str,
+ _value: &T)
+ -> Result<(), Error> {
+ unreachable!()
}
- fn serialize_struct_variant_end(&mut self,
- _state: ())
- -> Result<(), Error> {
- Err(Error::unsupported_pair())
+ fn end(self) -> Result<(), Error> {
+ unreachable!()
}
}
+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())
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-02 09:15:49 +0000