diff --git a/src/core/matrix/pdu/unsigned.rs b/src/core/matrix/pdu/unsigned.rs index 2db1d55af..be293a408 100644 --- a/src/core/matrix/pdu/unsigned.rs +++ b/src/core/matrix/pdu/unsigned.rs @@ -58,7 +58,7 @@ pub fn add_age(&mut self) -> Result { Ok(()) } - pub fn add_relation(&mut self, name: &str, pdu: Option<&Pdu>) -> Result { + pub fn add_relation(&mut self, name: &str, pdu: Option<&Self>) -> Result { use serde_json::Map; let mut unsigned: Map = self diff --git a/src/macros/utils.rs b/src/macros/utils.rs index a45e5ecc5..598f60ffa 100644 --- a/src/macros/utils.rs +++ b/src/macros/utils.rs @@ -44,25 +44,6 @@ pub(crate) fn legacy_is_cargo_build() -> bool { pub(crate) fn is_cargo_test() -> bool { std::env::args().any(|flag| flag == "--test") } -pub(crate) fn get_named_generics(args: &[Meta], name: &str) -> Result { - const DEFAULT: &str = "<>"; - - parse_str::(&get_named_string(args, name).unwrap_or_else(|| DEFAULT.to_owned())) -} - -pub(crate) fn get_named_string(args: &[Meta], name: &str) -> Option { - args.iter().find_map(|arg| { - let value = arg.require_name_value().ok()?; - let Expr::Lit(ref lit) = value.value else { - return None; - }; - let Lit::Str(ref str) = lit.lit else { - return None; - }; - value.path.is_ident(name).then_some(str.value()) - }) -} - #[must_use] pub(crate) fn camel_to_snake_string(s: &str) -> String { let mut output = String::with_capacity(