diff --git a/ruma-events/src/lib.rs b/ruma-events/src/lib.rs index bd6c821f..2b87bad2 100644 --- a/ruma-events/src/lib.rs +++ b/ruma-events/src/lib.rs @@ -134,8 +134,6 @@ mod error; mod event_kinds; mod event_type; 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 // that expect `ruma_events` to exist in the prelude. diff --git a/ruma-events/src/util.rs b/ruma-events/src/util.rs deleted file mode 100644 index ba5050bd..00000000 --- a/ruma-events/src/util.rs +++ /dev/null @@ -1,23 +0,0 @@ -use serde::de::DeserializeOwned; -use serde_json::Value as JsonValue; - -pub fn try_variant_from_value(value: JsonValue, variant: fn(T) -> U) -> Result -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(error: serde_json::Error) -> E { - E::custom(error.to_string()) -} - -pub fn get_field(value: &JsonValue, field: &'static str) -> Result -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) -}