nikdoof/rustical
1
1
Fork 0
mirror of https://github.com/lennart-k/rustical.git synced 2025-12-14 03:32:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove Resource::PropName

Browse Source
This commit is contained in:
Lennart
2025-01-18 23:18:59 +01:00
parent 020e836c42
commit 8359e4ee1c
11 changed files with 29 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
crates/caldav/src/calendar/resource.rs
View File

@@ -93,7 +93,6 @@ impl DavPushExtension for CalendarResource {
}
impl Resource for CalendarResource {
type PropName = CalendarPropWrapperName;
type Prop = CalendarPropWrapper;
type Error = Error;
type PrincipalResource = PrincipalResource;
@@ -119,7 +118,7 @@ impl Resource for CalendarResource {
&self,
rmap: &ResourceMap,
user: &User,
prop: &Self::PropName,
prop: &CalendarPropWrapperName,
) -> Result<Self::Prop, Self::Error> {
Ok(match prop {
CalendarPropWrapperName::Calendar(prop) => CalendarPropWrapper::Calendar(match prop {
@@ -230,7 +229,7 @@ impl Resource for CalendarResource {
}
}
fn remove_prop(&mut self, prop: &Self::PropName) -> Result<(), rustical_dav::Error> {
fn remove_prop(&mut self, prop: &CalendarPropWrapperName) -> Result<(), rustical_dav::Error> {
if self.read_only {
return Err(rustical_dav::Error::PropReadOnly);
}

3
crates/caldav/src/calendar_object/resource.rs
View File

@@ -52,7 +52,6 @@ pub struct CalendarObjectResource {
}
impl Resource for CalendarObjectResource {
type PropName = CalendarObjectPropWrapperName;
type Prop = CalendarObjectPropWrapper;
type Error = Error;
type PrincipalResource = PrincipalResource;
@@ -65,7 +64,7 @@ impl Resource for CalendarObjectResource {
&self,
rmap: &ResourceMap,
user: &User,
prop: &Self::PropName,
prop: &CalendarObjectPropWrapperName,
) -> Result<Self::Prop, Self::Error> {
Ok(match prop {
CalendarObjectPropWrapperName::CalendarObject(prop) => {

3
crates/caldav/src/calendar_set/mod.rs
View File

@@ -24,7 +24,6 @@ pub enum PrincipalPropWrapper {
}
impl Resource for CalendarSetResource {
type PropName = PrincipalPropWrapperName;
type Prop = PrincipalPropWrapper;
type Error = Error;
type PrincipalResource = PrincipalResource;
@@ -40,7 +39,7 @@ impl Resource for CalendarSetResource {
&self,
rmap: &ResourceMap,
user: &User,
prop: &Self::PropName,
prop: &PrincipalPropWrapperName,
) -> Result<Self::Prop, Self::Error> {
Ok(match prop {
PrincipalPropWrapperName::Common(prop) => PrincipalPropWrapper::Common(

3
crates/caldav/src/principal/mod.rs
View File

@@ -59,7 +59,6 @@ impl NamedRoute for PrincipalResource {
}
impl Resource for PrincipalResource {
type PropName = PrincipalPropWrapperName;
type Prop = PrincipalPropWrapper;
type Error = Error;
type PrincipalResource = PrincipalResource;
@@ -75,7 +74,7 @@ impl Resource for PrincipalResource {
&self,
rmap: &ResourceMap,
user: &User,
prop: &Self::PropName,
prop: &PrincipalPropWrapperName,
) -> Result<Self::Prop, Self::Error> {
let principal_url = Self::get_url(rmap, vec![&self.principal]).unwrap();
let home_set = CalendarHomeSet(