mirror of
https://github.com/lennart-k/rustical.git
synced 2025-12-14 02:22:21 +00:00
minor cleanup stuff
This commit is contained in:
@@ -68,8 +68,8 @@ impl Resource for RootResource {
|
|||||||
|
|
||||||
fn get_prop(
|
fn get_prop(
|
||||||
&self,
|
&self,
|
||||||
rmap: &ResourceMap,
|
_rmap: &ResourceMap,
|
||||||
user: &User,
|
_user: &User,
|
||||||
prop: &Self::PropName,
|
prop: &Self::PropName,
|
||||||
) -> Result<Self::Prop, Self::Error> {
|
) -> Result<Self::Prop, Self::Error> {
|
||||||
Ok(match prop {
|
Ok(match prop {
|
||||||
|
|||||||
@@ -88,8 +88,8 @@ impl Resource for AddressObjectResource {
|
|||||||
|
|
||||||
fn get_prop(
|
fn get_prop(
|
||||||
&self,
|
&self,
|
||||||
rmap: &ResourceMap,
|
_rmap: &ResourceMap,
|
||||||
user: &User,
|
_user: &User,
|
||||||
prop: &Self::PropName,
|
prop: &Self::PropName,
|
||||||
) -> Result<Self::Prop, Self::Error> {
|
) -> Result<Self::Prop, Self::Error> {
|
||||||
Ok(match prop {
|
Ok(match prop {
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
use crate::depth_header::Depth;
|
use crate::depth_header::Depth;
|
||||||
use crate::privileges::UserPrivilege;
|
use crate::privileges::UserPrivilege;
|
||||||
use crate::resource::InvalidProperty;
|
|
||||||
use crate::resource::Resource;
|
use crate::resource::Resource;
|
||||||
use crate::resource::ResourceService;
|
use crate::resource::ResourceService;
|
||||||
use crate::xml::multistatus::PropstatWrapper;
|
use crate::xml::multistatus::PropstatWrapper;
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ use actix_web::{
|
|||||||
dev::ServiceResponse,
|
dev::ServiceResponse,
|
||||||
http::{Method, StatusCode},
|
http::{Method, StatusCode},
|
||||||
middleware::{ErrorHandlerResponse, ErrorHandlers},
|
middleware::{ErrorHandlerResponse, ErrorHandlers},
|
||||||
web::{self, Data, Path, Redirect},
|
web::{self, Data, Path},
|
||||||
HttpResponse, Responder,
|
HttpResponse, Responder,
|
||||||
};
|
};
|
||||||
use askama::Template;
|
use askama::Template;
|
||||||
@@ -53,7 +53,7 @@ struct CalendarPage {
|
|||||||
async fn route_calendar<C: CalendarStore + ?Sized>(
|
async fn route_calendar<C: CalendarStore + ?Sized>(
|
||||||
path: Path<(String, String)>,
|
path: Path<(String, String)>,
|
||||||
store: Data<C>,
|
store: Data<C>,
|
||||||
user: User,
|
_user: User,
|
||||||
) -> impl Responder {
|
) -> impl Responder {
|
||||||
let (owner, cal_id) = path.into_inner();
|
let (owner, cal_id) = path.into_inner();
|
||||||
CalendarPage {
|
CalendarPage {
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ use actix_web::{
|
|||||||
http::{header, StatusCode},
|
http::{header, StatusCode},
|
||||||
FromRequest, HttpMessage, HttpResponse, ResponseError,
|
FromRequest, HttpMessage, HttpResponse, ResponseError,
|
||||||
};
|
};
|
||||||
use derive_more::{derive::Deref, Display};
|
use derive_more::Display;
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
use std::future::{ready, Ready};
|
use std::future::{ready, Ready};
|
||||||
|
|
||||||
|
|||||||
@@ -2,5 +2,5 @@ use ical::parser::ical::component::IcalJournal;
|
|||||||
|
|
||||||
#[derive(Debug, Clone)]
|
#[derive(Debug, Clone)]
|
||||||
pub struct JournalObject {
|
pub struct JournalObject {
|
||||||
pub(crate) journal: IcalJournal,
|
pub journal: IcalJournal,
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,5 +2,5 @@ use ical::parser::ical::component::IcalTodo;
|
|||||||
|
|
||||||
#[derive(Debug, Clone)]
|
#[derive(Debug, Clone)]
|
||||||
pub struct TodoObject {
|
pub struct TodoObject {
|
||||||
pub(crate) todo: IcalTodo,
|
pub todo: IcalTodo,
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user