OMGeeky/google-apis-rs
1
0
Fork 0
mirror of https://github.com/OMGeeky/google-apis-rs.git synced 2026-01-24 12:15:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use Cow for reading base64 strings

Browse Source
This commit is contained in:
Yotam Tanay
2024-02-03 11:07:11 +02:00
parent f990fd0589
commit a8d7356282
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
google-apis-common/src/serde.rs
View File

@@ -139,7 +139,8 @@ pub mod duration {
pub mod standard_base64 {
use serde::{Deserialize, Deserializer, Serializer};
use serde_with::{DeserializeAs, SerializeAs};
use std::borrow::Cow;
pub struct Wrapper;
pub fn to_string(bytes: &Vec<u8>) -> String {
@@ -160,8 +161,8 @@ pub mod standard_base64 {
where
D: Deserializer<'de>,
{
let s: &str = Deserialize::deserialize(deserializer)?;
base64::decode_config(s, base64::STANDARD).map_err(serde::de::Error::custom)
let s: Cow<str> = Deserialize::deserialize(deserializer)?;
base64::decode_config(s.as_ref(), base64::STANDARD).map_err(serde::de::Error::custom)
}
}
}
@@ -169,6 +170,7 @@ pub mod standard_base64 {
pub mod urlsafe_base64 {
use serde::{Deserialize, Deserializer, Serializer};
use serde_with::{DeserializeAs, SerializeAs};
use std::borrow::Cow;
pub struct Wrapper;
@@ -190,8 +192,8 @@ pub mod urlsafe_base64 {
where
D: Deserializer<'de>,
{
let s: &str = Deserialize::deserialize(deserializer)?;
base64::decode_config(s, base64::URL_SAFE).map_err(serde::de::Error::custom)
let s: Cow<str> = Deserialize::deserialize(deserializer)?;
base64::decode_config(s.as_ref(), base64::URL_SAFE).map_err(serde::de::Error::custom)
}
}
}
@@ -302,7 +304,6 @@ mod test {
}
#[test]
#[should_panic(expected = "expected a borrowed string")]
fn standard_base64_de_reader_success_cases() {
let standard: Base64StandardWrapper =
serde_json::from_reader(r#"{"bytes": "cVhabzk6U21uOkN+MylFWFRJMVFLdEh2MShmVHp9"}"#.as_bytes()).unwrap();
@@ -317,11 +318,10 @@ mod test {
}
#[test]
#[should_panic(expected = "expected a borrowed string")]
fn urlsafe_base64_de_reader_success_cases() {
let url_safe: Base64URLSafeWrapper =
let wrapper: Base64URLSafeWrapper =
serde_json::from_reader(r#"{"bytes": "aGVsbG8gd29ybGQ="}"#.as_bytes()).unwrap();
assert_eq!(Some(b"hello world".as_slice()), url_safe.bytes.as_deref());
assert_eq!(Some(b"hello world".as_slice()), wrapper.bytes.as_deref());
}
#[test]