nikdoof/rustical
1
1
Fork 0
mirror of https://github.com/lennart-k/rustical.git synced 2025-12-14 07:02:24 +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/caldav/src/calendar/methods/mkcalendar.rs
View File

@@ -41,7 +41,7 @@ struct MkcalendarRequest {
}
#[instrument(parent = root_span.id(), skip(store, root_span))]
pub async fn route_mkcalendar<C: CalendarStore + ?Sized>(
pub async fn route_mkcalendar<C: CalendarStore>(
path: Path<(String, String)>,
body: String,
user: User,

2
crates/caldav/src/calendar/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<C: CalendarStore + ?Sized, S: SubscriptionStore + ?Sized>(
pub async fn route_post<C: CalendarStore, S: SubscriptionStore>(
path: Path<(String, String)>,
body: String,
user: User,

4
crates/caldav/src/calendar/methods/report/calendar_multiget.rs
View File

@@ -24,7 +24,7 @@ pub(crate) struct CalendarMultigetRequest {
pub(crate) href: Vec<String>,
}
pub async fn get_objects_calendar_multiget<C: CalendarStore + ?Sized>(
pub async fn get_objects_calendar_multiget<C: CalendarStore>(
cal_query: &CalendarMultigetRequest,
path: &str,
principal: &str,
@@ -52,7 +52,7 @@ pub async fn get_objects_calendar_multiget<C: CalendarStore + ?Sized>(
Ok((result, not_found))
}
pub async fn handle_calendar_multiget<C: CalendarStore + ?Sized>(
pub async fn handle_calendar_multiget<C: CalendarStore>(
cal_multiget: CalendarMultigetRequest,
req: HttpRequest,
user: &User,

4
crates/caldav/src/calendar/methods/report/calendar_query.rs
View File

@@ -175,7 +175,7 @@ pub struct CalendarQueryRequest {
pub(crate) timezone_id: Option<String>,
}
pub async fn get_objects_calendar_query<C: CalendarStore + ?Sized>(
pub async fn get_objects_calendar_query<C: CalendarStore>(
cal_query: &CalendarQueryRequest,
principal: &str,
cal_id: &str,
@@ -188,7 +188,7 @@ pub async fn get_objects_calendar_query<C: CalendarStore + ?Sized>(
Ok(objects)
}
pub async fn handle_calendar_query<C: CalendarStore + ?Sized>(
pub async fn handle_calendar_query<C: CalendarStore>(
cal_query: CalendarQueryRequest,
req: HttpRequest,
user: &User,

2
crates/caldav/src/calendar/methods/report/mod.rs
View File

@@ -22,7 +22,7 @@ pub(crate) enum ReportRequest {
}
#[instrument(skip(req, cal_store))]
pub async fn route_report_calendar<C: CalendarStore + ?Sized>(
pub async fn route_report_calendar<C: CalendarStore>(
path: Path<(String, String)>,
body: String,
user: User,

2
crates/caldav/src/calendar/methods/report/sync_collection.rs
View File

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

6
crates/caldav/src/calendar/resource.rs
View File

@@ -255,12 +255,12 @@ impl Resource for CalendarResource {
}
}
pub struct CalendarResourceService<C: CalendarStore + ?Sized, S: SubscriptionStore + ?Sized> {
pub struct CalendarResourceService<C: CalendarStore, S: SubscriptionStore> {
cal_store: Arc<C>,
__phantom_sub: PhantomData<S>,
}
impl<C: CalendarStore + ?Sized, S: SubscriptionStore + ?Sized> CalendarResourceService<C, S> {
impl<C: CalendarStore, S: SubscriptionStore> CalendarResourceService<C, S> {
pub fn new(cal_store: Arc<C>) -> Self {
Self {
cal_store,
@@ -270,7 +270,7 @@ impl<C: CalendarStore + ?Sized, S: SubscriptionStore + ?Sized> CalendarResourceS
}
#[async_trait(?Send)]
impl<C: CalendarStore + ?Sized, S: SubscriptionStore + ?Sized> ResourceService
impl<C: CalendarStore, S: SubscriptionStore> ResourceService
for CalendarResourceService<C, S>
{
type MemberType = CalendarObjectResource;