diff options
author | Haibo Huang <hhb@google.com> | 2020-07-10 20:22:56 -0700 |
---|---|---|
committer | Haibo Huang <hhb@google.com> | 2020-07-10 20:22:56 -0700 |
commit | 815f544e751e7b3cdc563ca0c97849f7decf782f (patch) | |
tree | e039ea0f1d64aa1ce4ba6e632a638d4ad3c6af2b /src/serde.rs | |
parent | 3ab24982d6da8a21528bd7ce8b2e675dd284b178 (diff) | |
download | bytes-815f544e751e7b3cdc563ca0c97849f7decf782f.tar.gz |
Upgrade rust/crates/bytes to 0.5.5
Change-Id: Ide2810cb2888de2899fd55127a81c685a5a037b6
Diffstat (limited to 'src/serde.rs')
-rw-r--r-- | src/serde.rs | 29 |
1 files changed, 18 insertions, 11 deletions
diff --git a/src/serde.rs b/src/serde.rs index 11020ae..0a5bd14 100644 --- a/src/serde.rs +++ b/src/serde.rs @@ -1,15 +1,16 @@ +use super::{Bytes, BytesMut}; use alloc::string::String; use alloc::vec::Vec; use core::{cmp, fmt}; -use serde::{Serialize, Serializer, Deserialize, Deserializer, de}; -use super::{Bytes, BytesMut}; +use serde::{de, Deserialize, Deserializer, Serialize, Serializer}; macro_rules! serde_impl { - ($ty:ident, $visitor_ty:ident, $from_slice:ident, $from_vec:ident) => ( + ($ty:ident, $visitor_ty:ident, $from_slice:ident, $from_vec:ident) => { impl Serialize for $ty { #[inline] fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error> - where S: Serializer + where + S: Serializer, { serializer.serialize_bytes(&self) } @@ -26,7 +27,8 @@ macro_rules! serde_impl { #[inline] fn visit_seq<V>(self, mut seq: V) -> Result<Self::Value, V::Error> - where V: de::SeqAccess<'de> + where + V: de::SeqAccess<'de>, { let len = cmp::min(seq.size_hint().unwrap_or(0), 4096); let mut values: Vec<u8> = Vec::with_capacity(len); @@ -40,28 +42,32 @@ macro_rules! serde_impl { #[inline] fn visit_bytes<E>(self, v: &[u8]) -> Result<Self::Value, E> - where E: de::Error + where + E: de::Error, { Ok($ty::$from_slice(v)) } #[inline] fn visit_byte_buf<E>(self, v: Vec<u8>) -> Result<Self::Value, E> - where E: de::Error + where + E: de::Error, { Ok($ty::$from_vec(v)) } #[inline] fn visit_str<E>(self, v: &str) -> Result<Self::Value, E> - where E: de::Error + where + E: de::Error, { Ok($ty::$from_slice(v.as_bytes())) } #[inline] fn visit_string<E>(self, v: String) -> Result<Self::Value, E> - where E: de::Error + where + E: de::Error, { Ok($ty::$from_vec(v.into_bytes())) } @@ -70,12 +76,13 @@ macro_rules! serde_impl { impl<'de> Deserialize<'de> for $ty { #[inline] fn deserialize<D>(deserializer: D) -> Result<$ty, D::Error> - where D: Deserializer<'de> + where + D: Deserializer<'de>, { deserializer.deserialize_byte_buf($visitor_ty) } } - ); + }; } serde_impl!(Bytes, BytesVisitor, copy_from_slice, from); |