Lots of clippy appeasement

crates/dav/src/resource/axum_methods.rs

@@ -9,42 +9,50 @@ pub type MethodFunction<State> =
 
 pub trait AxumMethods: Sized + Send + Sync + 'static {
     #[inline]
-    #[must_use] fn report() -> Option<MethodFunction<Self>> {
+    #[must_use]
+    fn report() -> Option<MethodFunction<Self>> {
         None
     }
 
     #[inline]
-    #[must_use] fn get() -> Option<MethodFunction<Self>> {
+    #[must_use]
+    fn get() -> Option<MethodFunction<Self>> {
         None
     }
 
     #[inline]
-    #[must_use] fn post() -> Option<MethodFunction<Self>> {
+    #[must_use]
+    fn post() -> Option<MethodFunction<Self>> {
         None
     }
 
     #[inline]
-    #[must_use] fn mkcol() -> Option<MethodFunction<Self>> {
+    #[must_use]
+    fn mkcol() -> Option<MethodFunction<Self>> {
         None
     }
 
     #[inline]
-    #[must_use] fn mkcalendar() -> Option<MethodFunction<Self>> {
+    #[must_use]
+    fn mkcalendar() -> Option<MethodFunction<Self>> {
         None
     }
 
     #[inline]
-    #[must_use] fn put() -> Option<MethodFunction<Self>> {
+    #[must_use]
+    fn put() -> Option<MethodFunction<Self>> {
         None
     }
 
     #[inline]
-    #[must_use] fn import() -> Option<MethodFunction<Self>> {
+    #[must_use]
+    fn import() -> Option<MethodFunction<Self>> {
         None
     }
 
     #[inline]
-    #[must_use] fn allow_header() -> Allow {
+    #[must_use]
+    fn allow_header() -> Allow {
         let mut allow = vec![
             Method::from_str("PROPFIND").unwrap(),
             Method::from_str("PROPPATCH").unwrap(),

crates/dav/src/resource/mod.rs

@@ -42,7 +42,8 @@ pub trait Resource: Clone + Send + 'static {
 
     fn get_resourcetype(&self) -> Resourcetype;
 
-    #[must_use] fn list_props() -> Vec<(Option<Namespace<'static>>, &'static str)> {
+    #[must_use]
+    fn list_props() -> Vec<(Option<Namespace<'static>>, &'static str)> {
         Self::Prop::variant_names()
     }
 
@@ -75,27 +76,27 @@ pub trait Resource: Clone + Send + 'static {
     }
 
     fn satisfies_if_match(&self, if_match: &IfMatch) -> bool {
-        if let Some(etag) = self.get_etag() {
-            if let Ok(etag) = ETag::from_str(&etag) {
-                if_match.precondition_passes(&etag)
-            } else {
-                if_match.is_any()
-            }
-        } else {
-            if_match.is_any()
-        }
+        self.get_etag().map_or_else(
+            || if_match.is_any(),
+            |etag| {
+                ETag::from_str(&etag).map_or_else(
+                    |_| if_match.is_any(),
+                    |etag| if_match.precondition_passes(&etag),
+                )
+            },
+        )
     }
 
     fn satisfies_if_none_match(&self, if_none_match: &IfNoneMatch) -> bool {
-        if let Some(etag) = self.get_etag() {
-            if let Ok(etag) = ETag::from_str(&etag) {
-                if_none_match.precondition_passes(&etag)
-            } else {
-                if_none_match != &IfNoneMatch::any()
-            }
-        } else {
-            if_none_match != &IfNoneMatch::any()
-        }
+        self.get_etag().map_or_else(
+            || if_none_match != &IfNoneMatch::any(),
+            |etag| {
+                ETag::from_str(&etag).map_or_else(
+                    |_| if_none_match != &IfNoneMatch::any(),
+                    |etag| if_none_match.precondition_passes(&etag),
+                )
+            },
+        )
     }
 
     fn get_user_privileges(

crates/dav/src/resource/resource_service.rs

@@ -76,10 +76,7 @@ pub trait ResourceService: Clone + Sized + Send + Sync + AxumMethods + 'static {
         Err(crate::Error::Forbidden.into())
     }
 
-    fn axum_service(self) -> AxumService<Self>
-    where
-        Self: AxumMethods,
-    {
+    fn axum_service(self) -> AxumService<Self> {
         AxumService::new(self)
     }