Skip to content

Commit

Permalink
Expose lifetimes in UrlEncodedSerializer
Browse files Browse the repository at this point in the history 
Forcing UrlEncodedSerializer to have a 'static lifetime is unnecessarily
restrictive and breaks a downstream dependency, reqwest. Thread a new
lifetime through to fix the problem.
  • Loading branch information
@benesch
benesch committed Jul 30, 2019
1 parent 4250a6b commit 31641af
Show file tree
Hide file tree
Showing 3 changed files with 55 additions and 55 deletions.
88 changes: 44 additions & 44 deletions src/ser/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,13 @@ pub fn to_string<T: ser::Serialize>(input: T) -> Result<String, Error> {
/// unit structs and unit variants.
///
/// * Newtype structs defer to their inner values.
pub struct Serializer<'output, Target: 'output + UrlEncodedTarget> {
urlencoder: &'output mut UrlEncodedSerializer<'static, Target>,
pub struct Serializer<'input, 'output, Target: 'output + UrlEncodedTarget> {
urlencoder: &'output mut UrlEncodedSerializer<'input, Target>,
}

impl<'output, Target: 'output + UrlEncodedTarget> Serializer<'output, Target> {
impl<'input, 'output, Target: 'output + UrlEncodedTarget> Serializer<'input, 'output, Target> {
/// Returns a new `Serializer`.
pub fn new(urlencoder: &'output mut UrlEncodedSerializer<'static, Target>) -> Self {
pub fn new(urlencoder: &'output mut UrlEncodedSerializer<'input, Target>) -> Self {
Serializer {
urlencoder: urlencoder,
}
Expand Down Expand Up @@ -95,62 +95,62 @@ impl ser::Error for Error {
}

/// Sequence serializer.
pub struct SeqSerializer<'output, Target: 'output + UrlEncodedTarget> {
urlencoder: &'output mut UrlEncodedSerializer<'static, Target>,
pub struct SeqSerializer<'input, 'output, Target: 'output + UrlEncodedTarget> {
urlencoder: &'output mut UrlEncodedSerializer<'input, Target>,
}

/// Tuple serializer.
///
/// Mostly used for arrays.
pub struct TupleSerializer<'output, Target: 'output + UrlEncodedTarget> {
urlencoder: &'output mut UrlEncodedSerializer<'static, Target>,
pub struct TupleSerializer<'input, 'output, Target: 'output + UrlEncodedTarget> {
urlencoder: &'output mut UrlEncodedSerializer<'input, Target>,
}

/// Tuple struct serializer.
///
/// Never instantiated, tuple structs are not supported.
pub struct TupleStructSerializer<'output, T: 'output + UrlEncodedTarget> {
inner: ser::Impossible<&'output mut UrlEncodedSerializer<'static, T>, Error>,
pub struct TupleStructSerializer<'input, 'output, T: 'output + UrlEncodedTarget> {
inner: ser::Impossible<&'output mut UrlEncodedSerializer<'input, T>, Error>,
}

/// Tuple variant serializer.
///
/// Never instantiated, tuple variants are not supported.
pub struct TupleVariantSerializer<'output, T: 'output + UrlEncodedTarget> {
inner: ser::Impossible<&'output mut UrlEncodedSerializer<'static, T>, Error>,
pub struct TupleVariantSerializer<'input, 'output, T: 'output + UrlEncodedTarget> {
inner: ser::Impossible<&'output mut UrlEncodedSerializer<'input, T>, Error>,
}

/// Map serializer.
pub struct MapSerializer<'output, Target: 'output + UrlEncodedTarget> {
urlencoder: &'output mut UrlEncodedSerializer<'static, Target>,
pub struct MapSerializer<'input, 'output, Target: 'output + UrlEncodedTarget> {
urlencoder: &'output mut UrlEncodedSerializer<'input, Target>,
key: Option<Cow<'static, str>>,
}

/// Struct serializer.
pub struct StructSerializer<'output, Target: 'output + UrlEncodedTarget> {
urlencoder: &'output mut UrlEncodedSerializer<'static, Target>,
pub struct StructSerializer<'input, 'output, Target: 'output + UrlEncodedTarget> {
urlencoder: &'output mut UrlEncodedSerializer<'input, Target>,
}

/// Struct variant serializer.
///
/// Never instantiated, struct variants are not supported.
pub struct StructVariantSerializer<'output, T: 'output + UrlEncodedTarget> {
inner: ser::Impossible<&'output mut UrlEncodedSerializer<'static, T>, Error>,
pub struct StructVariantSerializer<'input, 'output, T: 'output + UrlEncodedTarget> {
inner: ser::Impossible<&'output mut UrlEncodedSerializer<'input, T>, Error>,
}

impl<'output, Target> ser::Serializer for Serializer<'output, Target>
impl<'input, 'output, Target> ser::Serializer for Serializer<'input, 'output, Target>
where
Target: 'output + UrlEncodedTarget,
{
type Ok = &'output mut UrlEncodedSerializer<'static, Target>;
type Ok = &'output mut UrlEncodedSerializer<'input, Target>;
type Error = Error;
type SerializeSeq = SeqSerializer<'output, Target>;
type SerializeTuple = TupleSerializer<'output, Target>;
type SerializeTupleStruct = TupleStructSerializer<'output, Target>;
type SerializeTupleVariant = TupleVariantSerializer<'output, Target>;
type SerializeMap = MapSerializer<'output, Target>;
type SerializeStruct = StructSerializer<'output, Target>;
type SerializeStructVariant = StructVariantSerializer<'output, Target>;
type SerializeSeq = SeqSerializer<'input, 'output, Target>;
type SerializeTuple = TupleSerializer<'input, 'output, Target>;
type SerializeTupleStruct = TupleStructSerializer<'input, 'output, Target>;
type SerializeTupleVariant = TupleVariantSerializer<'input, 'output, Target>;
type SerializeMap = MapSerializer<'input, 'output, Target>;
type SerializeStruct = StructSerializer<'input, 'output, Target>;
type SerializeStructVariant = StructVariantSerializer<'input, 'output, Target>;

/// Returns an error.
fn serialize_bool(self, _v: bool) -> Result<Self::Ok, Error> {
Expand Down Expand Up @@ -352,11 +352,11 @@ where
}
}

impl<'output, Target> ser::SerializeSeq for SeqSerializer<'output, Target>
impl<'input, 'output, Target> ser::SerializeSeq for SeqSerializer<'input, 'output, Target>
where
Target: 'output + UrlEncodedTarget,
{
type Ok = &'output mut UrlEncodedSerializer<'static, Target>;
type Ok = &'output mut UrlEncodedSerializer<'input, Target>;
type Error = Error;

fn serialize_element<T: ?Sized + ser::Serialize>(
Expand All @@ -371,11 +371,11 @@ where
}
}

impl<'output, Target> ser::SerializeTuple for TupleSerializer<'output, Target>
impl<'input, 'output, Target> ser::SerializeTuple for TupleSerializer<'input, 'output, Target>
where
Target: 'output + UrlEncodedTarget,
{
type Ok = &'output mut UrlEncodedSerializer<'static, Target>;
type Ok = &'output mut UrlEncodedSerializer<'input, Target>;
type Error = Error;

fn serialize_element<T: ?Sized + ser::Serialize>(
Expand All @@ -390,12 +390,12 @@ where
}
}

impl<'output, Target> ser::SerializeTupleStruct
for TupleStructSerializer<'output, Target>
impl<'input, 'output, Target> ser::SerializeTupleStruct
for TupleStructSerializer<'input, 'output, Target>
where
Target: 'output + UrlEncodedTarget,
{
type Ok = &'output mut UrlEncodedSerializer<'static, Target>;
type Ok = &'output mut UrlEncodedSerializer<'input, Target>;
type Error = Error;

fn serialize_field<T: ?Sized + ser::Serialize>(
Expand All @@ -410,12 +410,12 @@ where
}
}

impl<'output, Target> ser::SerializeTupleVariant
for TupleVariantSerializer<'output, Target>
impl<'input, 'output, Target> ser::SerializeTupleVariant
for TupleVariantSerializer<'input, 'output, Target>
where
Target: 'output + UrlEncodedTarget,
{
type Ok = &'output mut UrlEncodedSerializer<'static, Target>;
type Ok = &'output mut UrlEncodedSerializer<'input, Target>;
type Error = Error;

fn serialize_field<T: ?Sized + ser::Serialize>(
Expand All @@ -430,11 +430,11 @@ where
}
}

impl<'output, Target> ser::SerializeMap for MapSerializer<'output, Target>
impl<'input, 'output, Target> ser::SerializeMap for MapSerializer<'input, 'output, Target>
where
Target: 'output + UrlEncodedTarget,
{
type Ok = &'output mut UrlEncodedSerializer<'static, Target>;
type Ok = &'output mut UrlEncodedSerializer<'input, Target>;
type Error = Error;

fn serialize_entry<
Expand Down Expand Up @@ -483,11 +483,11 @@ where
}
}

impl<'output, Target> ser::SerializeStruct for StructSerializer<'output, Target>
impl<'input, 'output, Target> ser::SerializeStruct for StructSerializer<'input, 'output, Target>
where
Target: 'output + UrlEncodedTarget,
{
type Ok = &'output mut UrlEncodedSerializer<'static, Target>;
type Ok = &'output mut UrlEncodedSerializer<'input, Target>;
type Error = Error;

fn serialize_field<T: ?Sized + ser::Serialize>(
Expand All @@ -504,12 +504,12 @@ where
}
}

impl<'output, Target> ser::SerializeStructVariant
for StructVariantSerializer<'output, Target>
impl<'input, 'output, Target> ser::SerializeStructVariant
for StructVariantSerializer<'input, 'output, Target>
where
Target: 'output + UrlEncodedTarget,
{
type Ok = &'output mut UrlEncodedSerializer<'static, Target>;
type Ok = &'output mut UrlEncodedSerializer<'input, Target>;
type Error = Error;

fn serialize_field<T: ?Sized + ser::Serialize>(
Expand Down
12 changes: 6 additions & 6 deletions src/ser/pair.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,24 +8,24 @@ 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<'static, Target>,
pub struct PairSerializer<'input, 'target, Target: 'target + UrlEncodedTarget> {
urlencoder: &'target mut UrlEncodedSerializer<'input, Target>,
state: PairState,
}

impl<'target, Target> PairSerializer<'target, Target>
impl<'input, 'target, Target> PairSerializer<'input, 'target, Target>
where
Target: 'target + UrlEncodedTarget,
{
pub fn new(urlencoder: &'target mut UrlEncodedSerializer<'static, Target>) -> Self {
pub fn new(urlencoder: &'target mut UrlEncodedSerializer<'input, Target>) -> Self {
PairSerializer {
urlencoder: urlencoder,
state: PairState::WaitingForKey,
}
}
}

impl<'target, Target> ser::Serializer for PairSerializer<'target, Target>
impl<'input, 'target, Target> ser::Serializer for PairSerializer<'input, 'target, Target>
where
Target: 'target + UrlEncodedTarget,
{
Expand Down Expand Up @@ -200,7 +200,7 @@ where
}
}

impl<'target, Target> ser::SerializeTuple for PairSerializer<'target, Target>
impl<'input, 'target, Target> ser::SerializeTuple for PairSerializer<'input, 'target, Target>
where
Target: 'target + UrlEncodedTarget,
{
Expand Down
10 changes: 5 additions & 5 deletions src/ser/value.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,20 @@ use std::str;
use url::form_urlencoded::Serializer as UrlEncodedSerializer;
use url::form_urlencoded::Target as UrlEncodedTarget;

pub struct ValueSink<'key, 'target, Target>
pub struct ValueSink<'input, 'key, 'target, Target>
where
Target: 'target + UrlEncodedTarget,
{
urlencoder: &'target mut UrlEncodedSerializer<'static, Target>,
urlencoder: &'target mut UrlEncodedSerializer<'input, Target>,
key: &'key str,
}

impl<'key, 'target, Target> ValueSink<'key, 'target, Target>
impl<'input, 'key, 'target, Target> ValueSink<'input, 'key, 'target, Target>
where
Target: 'target + UrlEncodedTarget,
{
pub fn new(
urlencoder: &'target mut UrlEncodedSerializer<'static, Target>,
urlencoder: &'target mut UrlEncodedSerializer<'input, Target>,
key: &'key str,
) -> Self {
ValueSink {
Expand All @@ -28,7 +28,7 @@ where
}
}

impl<'key, 'target, Target> Sink for ValueSink<'key, 'target, Target>
impl<'input, 'key, 'target, Target> Sink for ValueSink<'input, 'key, 'target, Target>
where
Target: 'target + UrlEncodedTarget,
{
Expand Down

0 comments on commit 31641af

Please sign in to comment.