From 2670abfef0178e5fe3839c8809ebac619c96257c Mon Sep 17 00:00:00 2001 From: Lennart <18233294+lennart-k@users.noreply.github.com> Date: Sun, 29 Sep 2024 15:22:45 +0200 Subject: [PATCH] typing --- .../src/calendar/methods/report/calendar_multiget.rs | 2 +- .../caldav/src/calendar/methods/report/calendar_query.rs | 2 +- .../src/calendar/methods/report/sync_collection.rs | 2 +- crates/dav/src/methods/propfind.rs | 2 +- crates/dav/src/xml/tag_list.rs | 9 ++++++--- 5 files changed, 10 insertions(+), 7 deletions(-) diff --git a/crates/caldav/src/calendar/methods/report/calendar_multiget.rs b/crates/caldav/src/calendar/methods/report/calendar_multiget.rs index 15cab01..d53bc92 100644 --- a/crates/caldav/src/calendar/methods/report/calendar_multiget.rs +++ b/crates/caldav/src/calendar/methods/report/calendar_multiget.rs @@ -79,7 +79,7 @@ pub async fn handle_calendar_multiget( // TODO: Implement return Err(Error::NotImplemented); } - PropfindType::Prop(PropElement { prop: prop_tags }) => prop_tags.into(), + PropfindType::Prop(PropElement { prop: prop_tags }) => prop_tags.into_inner(), }; let props: Vec<&str> = props.iter().map(String::as_str).collect(); diff --git a/crates/caldav/src/calendar/methods/report/calendar_query.rs b/crates/caldav/src/calendar/methods/report/calendar_query.rs index 1ce3831..f0351d0 100644 --- a/crates/caldav/src/calendar/methods/report/calendar_query.rs +++ b/crates/caldav/src/calendar/methods/report/calendar_query.rs @@ -118,7 +118,7 @@ pub async fn handle_calendar_query( // TODO: Implement return Err(Error::NotImplemented); } - PropfindType::Prop(PropElement { prop: prop_tags }) => prop_tags.into(), + PropfindType::Prop(PropElement { prop: prop_tags }) => prop_tags.into_inner(), }; let props: Vec<&str> = props.iter().map(String::as_str).collect(); diff --git a/crates/caldav/src/calendar/methods/report/sync_collection.rs b/crates/caldav/src/calendar/methods/report/sync_collection.rs index bc24d04..68cdad0 100644 --- a/crates/caldav/src/calendar/methods/report/sync_collection.rs +++ b/crates/caldav/src/calendar/methods/report/sync_collection.rs @@ -58,7 +58,7 @@ pub async fn handle_sync_collection( // TODO: Implement return Err(Error::NotImplemented); } - PropfindType::Prop(PropElement { prop: prop_tags }) => prop_tags.into(), + PropfindType::Prop(PropElement { prop: prop_tags }) => prop_tags.into_inner(), }; let props: Vec<&str> = props.iter().map(String::as_str).collect(); diff --git a/crates/dav/src/methods/propfind.rs b/crates/dav/src/methods/propfind.rs index 608613e..6675ce7 100644 --- a/crates/dav/src/methods/propfind.rs +++ b/crates/dav/src/methods/propfind.rs @@ -75,7 +75,7 @@ pub async fn route_propfind( // TODO: Implement return Err(Error::InternalError.into()); } - PropfindType::Prop(PropElement { prop: prop_tags }) => prop_tags.into(), + PropfindType::Prop(PropElement { prop: prop_tags }) => prop_tags.into_inner(), }; let props: Vec<&str> = props.iter().map(String::as_str).collect(); diff --git a/crates/dav/src/xml/tag_list.rs b/crates/dav/src/xml/tag_list.rs index 6a8a970..422e8ae 100644 --- a/crates/dav/src/xml/tag_list.rs +++ b/crates/dav/src/xml/tag_list.rs @@ -51,9 +51,12 @@ impl Serialize for TagList { } } -impl From for Vec { - fn from(value: TagList) -> Self { - value.0 +impl TagList { + pub fn inner(&self) -> &Vec { + &self.0 + } + pub fn into_inner(self) -> Vec { + self.0 } }