yetangitu/librespot
1
0
Fork 0
mirror of https://github.com/librespot-org/librespot.git synced 2025-10-04 10:19:27 +02:00
Code Issues Releases Wiki Activity

Use serde 1.0

Browse source
This commit is contained in:
Michael Edwards 2019-03-15 15:50:15 +01:00
parent 8b32e7a63e
commit 0bbca1d8bc
6 changed files with 31 additions and 98 deletions
Download patch file Download diff file Expand all files Collapse all files

8
core/src/authentication.rs
View file

@ -142,10 +142,10 @@ where
serde::Serialize::serialize(&v.value(), ser)
}
fn deserialize_protobuf_enum<T, D>(de: D) -> Result<T, D::Error>
fn deserialize_protobuf_enum<'de, T, D>(de: D) -> Result<T, D::Error>
where
T: ProtobufEnum,
D: serde::Deserializer,
D: serde::Deserializer<'de>,
{
let v: i32 = try!(serde::Deserialize::deserialize(de));
T::from_i32(v).ok_or_else(|| serde::de::Error::custom("Invalid enum value"))
@ -159,9 +159,9 @@ where
serde::Serialize::serialize(&base64::encode(v.as_ref()), ser)
}
fn deserialize_base64<D>(de: D) -> Result<Vec<u8>, D::Error>
fn deserialize_base64<'de, D>(de: D) -> Result<Vec<u8>, D::Error>
where
D: serde::Deserializer,
D: serde::Deserializer<'de>,
{
let v: String = try!(serde::Deserialize::deserialize(de));
base64::decode(&v).map_err(|e| serde::de::Error::custom(e.to_string()))