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

stores: Switch from dyn to impl and implement Sized

Browse Source
This commit is contained in:
Lennart
2025-01-15 17:21:01 +01:00
parent 751c2d1ce7
commit 6d78a3936f
28 changed files with 55 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crates/carddav/src/addressbook/methods/mkcol.rs
View File

@@ -32,7 +32,7 @@ struct MkcolRequest {
}
#[instrument(parent = root_span.id(), skip(store, root_span))]
pub async fn route_mkcol<AS: AddressbookStore + ?Sized>(
pub async fn route_mkcol<AS: AddressbookStore>(
path: Path<(String, String)>,
body: String,
user: User,

2
crates/carddav/src/addressbook/methods/post.rs
View File

@@ -10,7 +10,7 @@ use tracing::instrument;
use tracing_actix_web::RootSpan;
#[instrument(parent = root_span.id(), skip(store, subscription_store, root_span, req))]
pub async fn route_post<A: AddressbookStore + ?Sized, S: SubscriptionStore + ?Sized>(
pub async fn route_post<A: AddressbookStore, S: SubscriptionStore>(
path: Path<(String, String)>,
body: String,
user: User,

4
crates/carddav/src/addressbook/methods/report/addressbook_multiget.rs
View File

@@ -23,7 +23,7 @@ pub struct AddressbookMultigetRequest {
href: Vec<String>,
}
pub async fn get_objects_addressbook_multiget<AS: AddressbookStore + ?Sized>(
pub async fn get_objects_addressbook_multiget<AS: AddressbookStore>(
addressbook_multiget: &AddressbookMultigetRequest,
path: &str,
principal: &str,
@@ -52,7 +52,7 @@ pub async fn get_objects_addressbook_multiget<AS: AddressbookStore + ?Sized>(
Ok((result, not_found))
}
pub async fn handle_addressbook_multiget<AS: AddressbookStore + ?Sized>(
pub async fn handle_addressbook_multiget<AS: AddressbookStore>(
addr_multiget: AddressbookMultigetRequest,
req: HttpRequest,
user: &User,

2
crates/carddav/src/addressbook/methods/report/mod.rs
View File

@@ -19,7 +19,7 @@ pub(crate) enum ReportRequest {
}
#[instrument(skip(req, addr_store))]
pub async fn route_report_addressbook<AS: AddressbookStore + ?Sized>(
pub async fn route_report_addressbook<AS: AddressbookStore>(
path: Path<(String, String)>,
body: String,
user: User,

2
crates/carddav/src/addressbook/methods/report/sync_collection.rs
View File

@@ -56,7 +56,7 @@ pub(crate) struct SyncCollectionRequest {
pub(crate) limit: Option<u64>,
}
pub async fn handle_sync_collection<AS: AddressbookStore + ?Sized>(
pub async fn handle_sync_collection<AS: AddressbookStore>(
sync_collection: SyncCollectionRequest,
req: HttpRequest,
user: &User,

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

@@ -22,13 +22,13 @@ use std::str::FromStr;
use std::sync::Arc;
use strum::{EnumDiscriminants, EnumString, IntoStaticStr, VariantNames};
pub struct AddressbookResourceService<AS: AddressbookStore + ?Sized, S: SubscriptionStore + ?Sized>
pub struct AddressbookResourceService<AS: AddressbookStore, S: SubscriptionStore>
{
addr_store: Arc<AS>,
__phantom_sub: PhantomData<S>,
}
impl<A: AddressbookStore + ?Sized, S: SubscriptionStore + ?Sized> AddressbookResourceService<A, S> {
impl<A: AddressbookStore, S: SubscriptionStore> AddressbookResourceService<A, S> {
pub fn new(addr_store: Arc<A>) -> Self {
Self {
addr_store,
@@ -174,7 +174,7 @@ impl Resource for AddressbookResource {
}
#[async_trait(?Send)]
impl<AS: AddressbookStore + ?Sized, S: SubscriptionStore + ?Sized> ResourceService
impl<AS: AddressbookStore, S: SubscriptionStore> ResourceService
for AddressbookResourceService<AS, S>
{
type MemberType = AddressObjectResource;