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

base64 0.22, serde_with 3, url 2

Browse Source 
url v2 no longer exports percent_encoding, add percent-encoding v2 as explicit dependency

percent-encoding v2 no longer includes predefined encoding sets
This commit is contained in:
Philip Dubé
2024-04-26 00:52:10 +00:00
parent 762690ab03
commit 0fca3a944a
3 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -144,6 +144,7 @@ pub mod duration {
}
pub mod standard_base64 {
use base64::Engine as _;
use serde::{Deserialize, Deserializer, Serializer};
use serde_with::{DeserializeAs, SerializeAs};
use std::borrow::Cow;
@@ -151,7 +152,7 @@ pub mod standard_base64 {
pub struct Wrapper;
pub fn to_string(bytes: &Vec<u8>) -> String {
base64::encode_config(bytes, base64::STANDARD)
base64::prelude::BASE64_STANDARD.encode(bytes)
}
impl SerializeAs<Vec<u8>> for Wrapper {
@@ -169,12 +170,13 @@ pub mod standard_base64 {
D: Deserializer<'de>,
{
let s: Cow<str> = Deserialize::deserialize(deserializer)?;
base64::decode_config(s.as_ref(), base64::STANDARD).map_err(serde::de::Error::custom)
base64::prelude::BASE64_STANDARD.decode(s.as_ref()).map_err(serde::de::Error::custom)
}
}
}
pub mod urlsafe_base64 {
use base64::Engine as _;
use serde::{Deserialize, Deserializer, Serializer};
use serde_with::{DeserializeAs, SerializeAs};
use std::borrow::Cow;
@@ -182,7 +184,7 @@ pub mod urlsafe_base64 {
pub struct Wrapper;
pub fn to_string(bytes: &Vec<u8>) -> String {
base64::encode_config(bytes, base64::URL_SAFE)
base64::prelude::BASE64_URL_SAFE.encode(bytes)
}
impl SerializeAs<Vec<u8>> for Wrapper {
@@ -200,7 +202,7 @@ pub mod urlsafe_base64 {
D: Deserializer<'de>,
{
let s: Cow<str> = Deserialize::deserialize(deserializer)?;
base64::decode_config(s.as_ref(), base64::URL_SAFE).map_err(serde::de::Error::custom)
base64::prelude::BASE64_URL_SAFE.decode(s.as_ref()).map_err(serde::de::Error::custom)
}
}
}
@@ -212,6 +214,7 @@ pub fn datetime_to_string(datetime: &chrono::DateTime<chrono::offset::Utc>) -> S
#[cfg(test)]
mod test {
use super::{duration, standard_base64, urlsafe_base64};
use base64::Engine as _;
use serde::{Deserialize, Serialize};
use serde_with::{serde_as, DisplayFromStr};

3
google-apis-common/src/url.rs
View File

@@ -1,6 +1,6 @@
use std::borrow::Cow;
use ::url::percent_encoding::{percent_encode, DEFAULT_ENCODE_SET};
use ::percent_encoding::{percent_encode, AsciiSet, CONTROLS};
use ::url::Url;
pub struct Params<'a> {
@@ -40,6 +40,7 @@ impl<'a> Params<'a> {
from: &str,
url_encode: bool,
) -> String {
const DEFAULT_ENCODE_SET: &AsciiSet = &CONTROLS.add(b' ').add(b'"').add(b'#').add(b'<').add(b'>').add(b'`').add(b'?').add(b'{').add(b'}');
if url_encode {
let mut replace_with: Cow<str> = self.get(param).unwrap_or_default().into();
if from.as_bytes()[1] == b'+' {