Add serialization support for sequences
Sequences of values for one key are serialized as `key=value1&key=value2`
This commit is contained in:
parent
2032fc2a94
commit
0c775de766
@ -1,6 +1,6 @@
|
|||||||
use std::{borrow::Cow, ops::Deref};
|
use std::{borrow::Cow, ops::Deref};
|
||||||
|
|
||||||
use serde::Serialize;
|
use serde::ser;
|
||||||
|
|
||||||
use super::{part::Sink, Error};
|
use super::{part::Sink, Error};
|
||||||
|
|
||||||
@ -47,6 +47,7 @@ where
|
|||||||
End: for<'key> FnOnce(Key<'key>) -> Result<Ok, Error>,
|
End: for<'key> FnOnce(Key<'key>) -> Result<Ok, Error>,
|
||||||
{
|
{
|
||||||
type Ok = Ok;
|
type Ok = Ok;
|
||||||
|
type SerializeSeq = ser::Impossible<Self::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))
|
(self.end)(Key::Static(value))
|
||||||
@ -64,13 +65,17 @@ where
|
|||||||
Err(self.unsupported())
|
Err(self.unsupported())
|
||||||
}
|
}
|
||||||
|
|
||||||
fn serialize_some<T: ?Sized + Serialize>(
|
fn serialize_some<T: ?Sized + ser::Serialize>(
|
||||||
self,
|
self,
|
||||||
_value: &T,
|
_value: &T,
|
||||||
) -> Result<Ok, Error> {
|
) -> Result<Ok, Error> {
|
||||||
Err(self.unsupported())
|
Err(self.unsupported())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn serialize_seq(self) -> Result<Self::SerializeSeq, Error> {
|
||||||
|
Err(self.unsupported())
|
||||||
|
}
|
||||||
|
|
||||||
fn unsupported(self) -> Error {
|
fn unsupported(self) -> Error {
|
||||||
Error::Custom("unsupported key".into())
|
Error::Custom("unsupported key".into())
|
||||||
}
|
}
|
||||||
|
@ -16,6 +16,7 @@ impl<S: Sink> PartSerializer<S> {
|
|||||||
|
|
||||||
pub trait Sink: Sized {
|
pub trait Sink: Sized {
|
||||||
type Ok;
|
type Ok;
|
||||||
|
type SerializeSeq: ser::SerializeSeq<Ok = Self::Ok, Error = Error>;
|
||||||
|
|
||||||
fn serialize_static_str(
|
fn serialize_static_str(
|
||||||
self,
|
self,
|
||||||
@ -31,13 +32,15 @@ pub trait Sink: Sized {
|
|||||||
value: &T,
|
value: &T,
|
||||||
) -> Result<Self::Ok, Error>;
|
) -> Result<Self::Ok, Error>;
|
||||||
|
|
||||||
|
fn serialize_seq(self) -> Result<Self::SerializeSeq, Error>;
|
||||||
|
|
||||||
fn unsupported(self) -> Error;
|
fn unsupported(self) -> Error;
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<S: Sink> ser::Serializer for PartSerializer<S> {
|
impl<S: Sink> ser::Serializer for PartSerializer<S> {
|
||||||
type Ok = S::Ok;
|
type Ok = S::Ok;
|
||||||
type Error = Error;
|
type Error = Error;
|
||||||
type SerializeSeq = ser::Impossible<S::Ok, Error>;
|
type SerializeSeq = S::SerializeSeq;
|
||||||
type SerializeTuple = ser::Impossible<S::Ok, Error>;
|
type SerializeTuple = ser::Impossible<S::Ok, Error>;
|
||||||
type SerializeTupleStruct = ser::Impossible<S::Ok, Error>;
|
type SerializeTupleStruct = ser::Impossible<S::Ok, Error>;
|
||||||
type SerializeTupleVariant = ser::Impossible<S::Ok, Error>;
|
type SerializeTupleVariant = ser::Impossible<S::Ok, Error>;
|
||||||
@ -155,7 +158,7 @@ impl<S: Sink> ser::Serializer for PartSerializer<S> {
|
|||||||
self,
|
self,
|
||||||
_len: Option<usize>,
|
_len: Option<usize>,
|
||||||
) -> Result<Self::SerializeSeq, Error> {
|
) -> Result<Self::SerializeSeq, Error> {
|
||||||
Err(self.sink.unsupported())
|
self.sink.serialize_seq()
|
||||||
}
|
}
|
||||||
|
|
||||||
fn serialize_tuple(
|
fn serialize_tuple(
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
use std::str;
|
use std::str;
|
||||||
|
|
||||||
use serde::ser::Serialize;
|
use serde::ser;
|
||||||
use url::form_urlencoded::{
|
use url::form_urlencoded::{
|
||||||
Serializer as UrlEncodedSerializer, Target as UrlEncodedTarget,
|
Serializer as UrlEncodedSerializer, Target as UrlEncodedTarget,
|
||||||
};
|
};
|
||||||
@ -36,6 +36,7 @@ where
|
|||||||
Target: 'target + UrlEncodedTarget,
|
Target: 'target + UrlEncodedTarget,
|
||||||
{
|
{
|
||||||
type Ok = ();
|
type Ok = ();
|
||||||
|
type SerializeSeq = Self;
|
||||||
|
|
||||||
fn serialize_str(self, value: &str) -> Result<(), Error> {
|
fn serialize_str(self, value: &str) -> Result<(), Error> {
|
||||||
self.urlencoder.append_pair(self.key, value);
|
self.urlencoder.append_pair(self.key, value);
|
||||||
@ -54,14 +55,41 @@ where
|
|||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
fn serialize_some<T: ?Sized + Serialize>(
|
fn serialize_some<T: ?Sized + ser::Serialize>(
|
||||||
self,
|
self,
|
||||||
value: &T,
|
value: &T,
|
||||||
) -> Result<Self::Ok, Error> {
|
) -> Result<Self::Ok, Error> {
|
||||||
value.serialize(PartSerializer::new(self))
|
value.serialize(PartSerializer::new(self))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn serialize_seq(self) -> Result<Self, Error> {
|
||||||
|
Ok(self)
|
||||||
|
}
|
||||||
|
|
||||||
fn unsupported(self) -> Error {
|
fn unsupported(self) -> Error {
|
||||||
Error::Custom("unsupported value".into())
|
Error::Custom("unsupported value".into())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
impl<'a, 'input, 'key, 'target, Target> ser::SerializeSeq
|
||||||
|
for &'a mut ValueSink<'input, 'key, 'target, Target>
|
||||||
|
where
|
||||||
|
Target: 'target + UrlEncodedTarget,
|
||||||
|
{
|
||||||
|
type Ok = ();
|
||||||
|
type Error = Error;
|
||||||
|
|
||||||
|
fn serialize_element<T: ?Sized>(
|
||||||
|
&mut self,
|
||||||
|
value: &T,
|
||||||
|
) -> Result<(), Self::Error>
|
||||||
|
where
|
||||||
|
T: ser::Serialize,
|
||||||
|
{
|
||||||
|
value.serialize(PartSerializer::new(&mut **self))
|
||||||
|
}
|
||||||
|
|
||||||
|
fn end(self) -> Result<Self::Ok, Self::Error> {
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@ -105,7 +105,6 @@ struct ListStruct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
#[ignore]
|
|
||||||
fn serialize_newstruct() {
|
fn serialize_newstruct() {
|
||||||
let s = NewStruct {
|
let s = NewStruct {
|
||||||
list: vec!["hello".into(), "world".into()],
|
list: vec!["hello".into(), "world".into()],
|
||||||
@ -117,7 +116,6 @@ fn serialize_newstruct() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
#[ignore]
|
|
||||||
fn serialize_vec_bool() {
|
fn serialize_vec_bool() {
|
||||||
let params = Wrapper {
|
let params = Wrapper {
|
||||||
item: vec![true, false, false],
|
item: vec![true, false, false],
|
||||||
@ -129,7 +127,6 @@ fn serialize_vec_bool() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
#[ignore]
|
|
||||||
fn serialize_vec_num() {
|
fn serialize_vec_num() {
|
||||||
let params = Wrapper {
|
let params = Wrapper {
|
||||||
item: vec![0, 1, 2],
|
item: vec![0, 1, 2],
|
||||||
@ -141,7 +138,6 @@ fn serialize_vec_num() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
#[ignore]
|
|
||||||
fn serialize_vec_str() {
|
fn serialize_vec_str() {
|
||||||
let params = Wrapper {
|
let params = Wrapper {
|
||||||
item: vec!["hello", "world", "hello"],
|
item: vec!["hello", "world", "hello"],
|
||||||
@ -153,7 +149,6 @@ fn serialize_vec_str() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
#[ignore]
|
|
||||||
fn serialize_struct_opt() {
|
fn serialize_struct_opt() {
|
||||||
let s = Struct {
|
let s = Struct {
|
||||||
list: vec![Some("hello".into()), Some("world".into())],
|
list: vec![Some("hello".into()), Some("world".into())],
|
||||||
@ -165,7 +160,6 @@ fn serialize_struct_opt() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
#[ignore]
|
|
||||||
fn serialize_struct_newtype() {
|
fn serialize_struct_newtype() {
|
||||||
let s = ListStruct {
|
let s = ListStruct {
|
||||||
list: vec![NewType(0), NewType(1)],
|
list: vec![NewType(0), NewType(1)],
|
||||||
@ -177,7 +171,6 @@ fn serialize_struct_newtype() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
#[ignore]
|
|
||||||
fn serialize_struct_unit_enum() {
|
fn serialize_struct_unit_enum() {
|
||||||
let params = Wrapper {
|
let params = Wrapper {
|
||||||
item: vec![X::A, X::B, X::C],
|
item: vec![X::A, X::B, X::C],
|
||||||
|
Loading…
x
Reference in New Issue
Block a user