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

events: Remove unused util module

Browse Source
This commit is contained in:
Jonas Platte 2020-06-16 02:15:54 +02:00
parent d78cd2ed15
commit 8195496cfd
No known key found for this signature in database
GPG Key ID: 7D261D771D915378
2 changed files with 0 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruma-events/src/lib.rs
View File

@ -134,8 +134,6 @@ mod error;
mod event_kinds; mod event_kinds;
mod event_type; mod event_type;
mod json; mod json;
#[doc(hidden)] // only public for external tests
pub mod util;
// Hack to allow both ruma-events itself and external crates (or tests) to use procedural macros // Hack to allow both ruma-events itself and external crates (or tests) to use procedural macros
// that expect `ruma_events` to exist in the prelude. // that expect `ruma_events` to exist in the prelude.

23
ruma-events/src/util.rs
View File

@ -1,23 +0,0 @@
use serde::de::DeserializeOwned;
use serde_json::Value as JsonValue;
pub fn try_variant_from_value<T, U, E>(value: JsonValue, variant: fn(T) -> U) -> Result<U, E>
where
T: DeserializeOwned,
E: serde::de::Error,
{
serde_json::from_value(value).map(variant).map_err(serde_json_error_to_generic_de_error)
}
pub fn serde_json_error_to_generic_de_error<E: serde::de::Error>(error: serde_json::Error) -> E {
E::custom(error.to_string())
}
pub fn get_field<T, E>(value: &JsonValue, field: &'static str) -> Result<T, E>
where
T: DeserializeOwned,
E: serde::de::Error,
{
serde_json::from_value(value.get(field).cloned().ok_or_else(|| E::missing_field(field))?)
.map_err(serde_json_error_to_generic_de_error)
}