nikdoof/rustical
1
1
Fork 0
mirror of https://github.com/lennart-k/rustical.git synced 2025-12-13 22:52:22 +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

3
crates/carddav/src/address_object/resource.rs
View File

@@ -48,7 +48,6 @@ pub struct AddressObjectResource {
}
impl Resource for AddressObjectResource {
type PropName = AddressObjectPropWrapperName;
type Prop = AddressObjectPropWrapper;
type Error = Error;
type PrincipalResource = PrincipalResource;
@@ -61,7 +60,7 @@ impl Resource for AddressObjectResource {
&self,
rmap: &ResourceMap,
user: &User,
prop: &Self::PropName,
prop: &AddressObjectPropWrapperName,
) -> Result<Self::Prop, Self::Error> {
Ok(match prop {
AddressObjectPropWrapperName::AddressObject(prop) => {

8
crates/carddav/src/addressbook/resource.rs
View File

@@ -81,7 +81,6 @@ impl DavPushExtension for AddressbookResource {
}
impl Resource for AddressbookResource {
type PropName = AddressbookPropWrapperName;
type Prop = AddressbookPropWrapper;
type Error = Error;
type PrincipalResource = PrincipalResource;
@@ -97,7 +96,7 @@ impl Resource for AddressbookResource {
&self,
rmap: &ResourceMap,
user: &User,
prop: &Self::PropName,
prop: &AddressbookPropWrapperName,
) -> Result<Self::Prop, Self::Error> {
Ok(match prop {
AddressbookPropWrapperName::Addressbook(prop) => {
@@ -153,7 +152,10 @@ impl Resource for AddressbookResource {
}
}
fn remove_prop(&mut self, prop: &Self::PropName) -> Result<(), rustical_dav::Error> {
fn remove_prop(
&mut self,
prop: &AddressbookPropWrapperName,
) -> Result<(), rustical_dav::Error> {
match prop {
AddressbookPropWrapperName::Addressbook(prop) => match prop {
AddressbookPropName::Displayname => {

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

@@ -64,7 +64,6 @@ impl NamedRoute for PrincipalResource {
}
impl Resource for PrincipalResource {
type PropName = PrincipalPropWrapperName;
type Prop = PrincipalPropWrapper;
type Error = Error;
type PrincipalResource = PrincipalResource;
@@ -80,7 +79,7 @@ impl Resource for PrincipalResource {
&self,
rmap: &ResourceMap,
user: &User,
prop: &Self::PropName,
prop: &PrincipalPropWrapperName,
) -> Result<Self::Prop, Self::Error> {
let principal_href = HrefElement::new(Self::get_principal_url(rmap, &self.principal));