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

resource: change some type signatures

Browse Source
This commit is contained in:
Lennart
2024-11-02 11:49:55 +01:00
parent 0c14f8ba90
commit f92be513dc
10 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crates/dav/src/methods/proppatch.rs
View File

@@ -110,7 +110,7 @@ pub async fn route_proppatch<R: ResourceService>(
}
Operation::Remove(_remove_el) => {
match <<R::Resource as Resource>::PropName as FromStr>::from_str(&propname) {
Ok(prop) => match resource.remove_prop(prop) {
Ok(prop) => match resource.remove_prop(&prop) {
Ok(()) => {
props_ok.push(propname);
}

8
crates/dav/src/resource.rs
View File

@@ -18,7 +18,7 @@ use std::str::FromStr;
use strum::VariantNames;
pub trait Resource: Clone {
type PropName: FromStr + VariantNames + Clone;
type PropName: FromStr + VariantNames;
type Prop: Serialize + for<'de> Deserialize<'de> + fmt::Debug + InvalidProperty;
type Error: ResponseError + From<crate::Error>;
@@ -30,14 +30,14 @@ pub trait Resource: Clone {
&self,
rmap: &ResourceMap,
user: &User,
prop: Self::PropName,
prop: &Self::PropName,
) -> Result<Self::Prop, Self::Error>;
fn set_prop(&mut self, _prop: Self::Prop) -> Result<(), crate::Error> {
Err(crate::Error::PropReadOnly)
}
fn remove_prop(&mut self, _prop: Self::PropName) -> Result<(), crate::Error> {
fn remove_prop(&mut self, _prop: &Self::PropName) -> Result<(), crate::Error> {
Err(crate::Error::PropReadOnly)
}
@@ -112,7 +112,7 @@ pub trait Resource: Clone {
let prop_responses = valid_props
.into_iter()
.map(|prop| self.get_prop(rmap, user, prop))
.map(|prop| self.get_prop(rmap, user, &prop))
.collect::<Result<Vec<Self::Prop>, Self::Error>>()?;
let mut propstats = vec![PropstatWrapper::Normal(PropstatElement {