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

common: Rewrite Raw::get_field to be as fast as possible

Browse Source
This commit is contained in:
Jonas Platte 2022-03-14 19:18:36 +01:00
parent 39cafa3a8f
commit a7bead5466
No known key found for this signature in database
GPG Key ID: BBA95679259D342F
2 changed files with 34 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
crates/ruma-common/src/serde/cow.rs
View File

@ -1,23 +1,6 @@
use std::{borrow::Cow, str};
use serde::de::{self, Deserialize, Deserializer, Unexpected, Visitor};
pub(crate) struct MyCowStr<'a>(Cow<'a, str>);
impl<'a> MyCowStr<'a> {
pub(crate) fn get(self) -> Cow<'a, str> {
self.0
}
}
impl<'de> Deserialize<'de> for MyCowStr<'de> {
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
where
D: Deserializer<'de>,
{
deserialize_cow_str(deserializer).map(Self)
}
}
use serde::de::{self, Deserializer, Unexpected, Visitor};
/// Deserialize a `Cow<'de, str>`.
///

38
crates/ruma-common/src/serde/raw.rs
View File

@ -6,13 +6,11 @@ use std::{
};
use serde::{
de::{Deserialize, Deserializer, IgnoredAny, MapAccess, Visitor},
de::{self, Deserialize, DeserializeSeed, Deserializer, IgnoredAny, MapAccess, Visitor},
ser::{Serialize, Serializer},
};
use serde_json::value::{to_raw_value as to_raw_json_value, RawValue as RawJsonValue};
use super::cow::MyCowStr;
/// A wrapper around `Box<RawValue>`, to be used in place of any type in the Matrix endpoint
/// definition to allow request and response types to contain that said type represented by
/// the generic argument `Ev`.
@ -97,6 +95,36 @@ impl<T> Raw<T> {
where
U: Deserialize<'a>,
{
struct FieldVisitor<'b>(&'b str);
impl<'b, 'de> Visitor<'de> for FieldVisitor<'b> {
type Value = bool;
fn expecting(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {
write!(formatter, "`{}`", self.0)
}
fn visit_str<E>(self, value: &str) -> Result<bool, E>
where
E: de::Error,
{
Ok(value == self.0)
}
}
struct Field<'b>(&'b str);
impl<'b, 'de> DeserializeSeed<'de> for Field<'b> {
type Value = bool;
fn deserialize<D>(self, deserializer: D) -> Result<bool, D::Error>
where
D: Deserializer<'de>,
{
deserializer.deserialize_identifier(FieldVisitor(self.0))
}
}
struct SingleFieldVisitor<'b, T> {
field_name: &'b str,
_phantom: PhantomData<T>,
@ -123,8 +151,8 @@ impl<T> Raw<T> {
A: MapAccess<'de>,
{
let mut res = None;
while let Some(key) = map.next_key::<MyCowStr<'_>>()? {
if key.get() == self.field_name {
while let Some(is_right_field) = map.next_key_seed(Field(self.field_name))? {
if is_right_field {
res = Some(map.next_value()?);
} else {
map.next_value::<IgnoredAny>()?;