chris/ruwuma
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert 'impl Sink for &mut ValueSink instead of for ValueSink'

Browse Source 
This reverts commit 2032fc2, which was never actually necessary
This commit is contained in:
Jonas Platte 2020-05-15 11:45:16 +02:00
parent 7aa27c2a2d
commit 73a46d6b21
No known key found for this signature in database
GPG Key ID: 7D261D771D915378
3 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/urlencoded/ser.rs
View File

@ -465,8 +465,8 @@ where
value: &V, value: &V,
) -> Result<(), Error> { ) -> Result<(), Error> {
let key_sink = key::KeySink::new(|key| { let key_sink = key::KeySink::new(|key| {
let mut value_sink = value::ValueSink::new(self.urlencoder, &key); let value_sink = value::ValueSink::new(self.urlencoder, &key);
value.serialize(part::PartSerializer::new(&mut value_sink))?; value.serialize(part::PartSerializer::new(value_sink))?;
self.key = None; self.key = None;
Ok(()) Ok(())
}); });
@ -490,8 +490,8 @@ where
) -> Result<(), Error> { ) -> Result<(), Error> {
{ {
let key = self.key.as_ref().ok_or_else(Error::no_key)?; let key = self.key.as_ref().ok_or_else(Error::no_key)?;
let mut value_sink = value::ValueSink::new(self.urlencoder, &key); let value_sink = value::ValueSink::new(self.urlencoder, &key);
value.serialize(part::PartSerializer::new(&mut value_sink))?; value.serialize(part::PartSerializer::new(value_sink))?;
} }
self.key = None; self.key = None;
Ok(()) Ok(())
@ -515,8 +515,8 @@ where
key: &'static str, key: &'static str,
value: &T, value: &T,
) -> Result<(), Error> { ) -> Result<(), Error> {
let mut value_sink = value::ValueSink::new(self.urlencoder, key); let value_sink = value::ValueSink::new(self.urlencoder, key);
value.serialize(part::PartSerializer::new(&mut value_sink)) value.serialize(part::PartSerializer::new(value_sink))
} }
fn end(self) -> Result<Self::Ok, Error> { fn end(self) -> Result<Self::Ok, Error> {

4
src/urlencoded/ser/pair.rs
View File

@ -225,8 +225,8 @@ where
} }
PairState::WaitingForValue { key } => { PairState::WaitingForValue { key } => {
let result = { let result = {
let mut value_sink = ValueSink::new(self.urlencoder, &key); let value_sink = ValueSink::new(self.urlencoder, &key);
let value_serializer = PartSerializer::new(&mut value_sink); let value_serializer = PartSerializer::new(value_sink);
value.serialize(value_serializer) value.serialize(value_serializer)
}; };
if result.is_ok() { if result.is_ok() {

13
src/urlencoded/ser/value.rs
View File

@ -30,8 +30,8 @@ where
} }
} }
impl<'a, 'input, 'key, 'target, Target> Sink impl<'input, 'key, 'target, Target> Sink
for &'a mut ValueSink<'input, 'key, 'target, Target> for ValueSink<'input, 'key, 'target, Target>
where where
Target: 'target + UrlEncodedTarget, Target: 'target + UrlEncodedTarget,
{ {
@ -71,8 +71,8 @@ where
} }
} }
impl<'a, 'input, 'key, 'target, Target> ser::SerializeSeq impl<'input, 'key, 'target, Target> ser::SerializeSeq
for &'a mut ValueSink<'input, 'key, 'target, Target> for ValueSink<'input, 'key, 'target, Target>
where where
Target: 'target + UrlEncodedTarget, Target: 'target + UrlEncodedTarget,
{ {
@ -86,7 +86,10 @@ where
where where
T: ser::Serialize, T: ser::Serialize,
{ {
value.serialize(PartSerializer::new(&mut **self)) value.serialize(PartSerializer::new(ValueSink {
urlencoder: self.urlencoder,
key: self.key,
}))
} }
fn end(self) -> Result<Self::Ok, Self::Error> { fn end(self) -> Result<Self::Ok, Self::Error> {