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

run clippy fix

Browse Source
This commit is contained in:
Lennart K
2025-10-27 19:01:04 +01:00
parent 08041c60be
commit 0d071d3b92
94 changed files with 455 additions and 484 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
crates/dav/src/resource/axum_methods.rs
View File

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

4
crates/dav/src/resource/axum_service.rs
View File

@@ -23,7 +23,7 @@ pub struct AxumService<RS: ResourceService + AxumMethods> {
}
impl<RS: ResourceService + AxumMethods> AxumService<RS> {
pub fn new(resource_service: RS) -> Self {
pub const fn new(resource_service: RS) -> Self {
Self { resource_service }
}
}
@@ -103,7 +103,7 @@ where
}
}
_ => {}
};
}
Box::pin(async move {
Ok(Response::builder()
.status(StatusCode::METHOD_NOT_ALLOWED)

2
crates/dav/src/resource/methods/copy.rs
View File

@@ -12,7 +12,7 @@ use serde::Deserialize;
use tracing::instrument;
#[instrument(skip(path, resource_service,))]
pub(crate) async fn axum_route_copy<R: ResourceService>(
pub async fn axum_route_copy<R: ResourceService>(
Path(path): Path<R::PathComponents>,
State(resource_service): State<R>,
depth: Option<Depth>,

5
crates/dav/src/resource/methods/delete.rs
View File

@@ -7,7 +7,7 @@ use axum_extra::TypedHeader;
use headers::{IfMatch, IfNoneMatch};
use http::HeaderMap;
pub(crate) async fn axum_route_delete<R: ResourceService>(
pub async fn axum_route_delete<R: ResourceService>(
Path(path): Path<R::PathComponents>,
State(resource_service): State<R>,
principal: R::Principal,
@@ -24,8 +24,7 @@ pub(crate) async fn axum_route_delete<R: ResourceService>(
}
let no_trash = header_map
.get("X-No-Trashbin")
.map(|val| matches!(val.to_str(), Ok("1")))
.unwrap_or(false);
.is_some_and(|val| matches!(val.to_str(), Ok("1")));
route_delete(
&path,
&principal,

10
crates/dav/src/resource/methods/mod.rs
View File

@@ -4,8 +4,8 @@ mod mv;
mod propfind;
mod proppatch;
pub(crate) use copy::axum_route_copy;
pub(crate) use delete::axum_route_delete;
pub(crate) use mv::axum_route_move;
pub(crate) use propfind::axum_route_propfind;
pub(crate) use proppatch::axum_route_proppatch;
pub use copy::axum_route_copy;
pub use delete::axum_route_delete;
pub use mv::axum_route_move;
pub use propfind::axum_route_propfind;
pub use proppatch::axum_route_proppatch;

2
crates/dav/src/resource/methods/mv.rs
View File

@@ -12,7 +12,7 @@ use serde::Deserialize;
use tracing::instrument;
#[instrument(skip(path, resource_service,))]
pub(crate) async fn axum_route_move<R: ResourceService>(
pub async fn axum_route_move<R: ResourceService>(
Path(path): Path<R::PathComponents>,
State(resource_service): State<R>,
depth: Option<Depth>,

4
crates/dav/src/resource/methods/propfind.rs
View File

@@ -15,7 +15,7 @@ type RSMultistatus<R> = MultistatusElement<
>;
#[instrument(skip(path, resource_service, puri))]
pub(crate) async fn axum_route_propfind<R: ResourceService>(
pub async fn axum_route_propfind<R: ResourceService>(
Path(path): Path<R::PathComponents>,
State(resource_service): State<R>,
depth: Depth,
@@ -36,7 +36,7 @@ pub(crate) async fn axum_route_propfind<R: ResourceService>(
.await
}
pub(crate) async fn route_propfind<R: ResourceService>(
pub async fn route_propfind<R: ResourceService>(
path_components: &R::PathComponents,
path: &str,
body: &str,

12
crates/dav/src/resource/methods/proppatch.rs
View File

@@ -61,7 +61,7 @@ enum Operation<T: XmlDeserialize> {
#[xml(ns = "crate::namespace::NS_DAV")]
struct PropertyupdateElement<T: XmlDeserialize>(#[xml(ty = "untagged", flatten)] Vec<Operation<T>>);
pub(crate) async fn axum_route_proppatch<R: ResourceService>(
pub async fn axum_route_proppatch<R: ResourceService>(
Path(path): Path<R::PathComponents>,
State(resource_service): State<R>,
principal: R::Principal,
@@ -71,7 +71,7 @@ pub(crate) async fn axum_route_proppatch<R: ResourceService>(
route_proppatch(&path, uri.path(), &body, &principal, &resource_service).await
}
pub(crate) async fn route_proppatch<R: ResourceService>(
pub async fn route_proppatch<R: ResourceService>(
path_components: &R::PathComponents,
path: &str,
body: &str,
@@ -96,7 +96,7 @@ pub(crate) async fn route_proppatch<R: ResourceService>(
let mut props_conflict = Vec::new();
let mut props_not_found = Vec::new();
for operation in operations.into_iter() {
for operation in operations {
match operation {
Operation::Set(SetPropertyElement {
prop: SetPropertyPropWrapperWrapper(properties),
@@ -113,7 +113,7 @@ pub(crate) async fn route_proppatch<R: ResourceService>(
Err(Error::PropReadOnly) => props_conflict
.push((ns.map(NamespaceOwned::from), propname.to_owned())),
Err(err) => return Err(err.into()),
};
}
}
SetPropertyPropWrapper::Invalid(invalid) => {
let propname = invalid.tag_name();
@@ -131,7 +131,7 @@ pub(crate) async fn route_proppatch<R: ResourceService>(
// This happens in following cases:
// - read-only properties with #[serde(skip_deserializing)]
// - internal properties
props_conflict.push(full_propname)
props_conflict.push(full_propname);
} else {
props_not_found.push((None, propname));
}
@@ -154,7 +154,7 @@ pub(crate) async fn route_proppatch<R: ResourceService>(
},
// I guess removing a nonexisting property should be successful :)
Err(_) => props_ok.push((None, propname)),
};
}
}
}
}

12
crates/dav/src/resource/mod.rs
View File

@@ -42,7 +42,7 @@ pub trait Resource: Clone + Send + 'static {
fn get_resourcetype(&self) -> Resourcetype;
fn list_props() -> Vec<(Option<Namespace<'static>>, &'static str)> {
#[must_use] fn list_props() -> Vec<(Option<Namespace<'static>>, &'static str)> {
Self::Prop::variant_names()
}
@@ -106,13 +106,13 @@ pub trait Resource: Clone + Send + 'static {
fn parse_propfind(
body: &str,
) -> Result<PropfindElement<<Self::Prop as PropName>::Names>, rustical_xml::XmlError> {
if !body.is_empty() {
PropfindElement::parse_str(body)
} else {
if body.is_empty() {
Ok(PropfindElement {
prop: PropfindType::Allprop,
include: None,
})
} else {
PropfindElement::parse_str(body)
}
}
@@ -139,7 +139,7 @@ pub trait Resource: Clone + Send + 'static {
.collect_vec();
return Ok(ResponseElement {
href: path.to_owned(),
href: path.clone(),
propstat: vec![PropstatWrapper::TagList(PropstatElement {
prop: TagList::from(props),
status: StatusCode::OK,
@@ -181,7 +181,7 @@ pub trait Resource: Clone + Send + 'static {
}));
}
Ok(ResponseElement {
href: path.to_owned(),
href: path.clone(),
propstat: propstats,
..Default::default()
})