From 002814a564fe92dc3eac882f01199f14ded402db Mon Sep 17 00:00:00 2001 From: Lennart K <18233294+lennart-k@users.noreply.github.com> Date: Thu, 8 Jan 2026 23:24:47 +0100 Subject: [PATCH] Remove unused code --- crates/ical/src/error.rs | 10 +----- crates/ical/src/timestamp.rs | 18 ---------- ...tests__caldav__calendar__get_body.snap.new | 14 ++++++++ ...rddav__addressbook__multiget_body.snap.new | 36 +++++++++++++++++++ 4 files changed, 51 insertions(+), 27 deletions(-) create mode 100644 src/integration_tests/caldav/snapshots/rustical__integration_tests__caldav__calendar__get_body.snap.new create mode 100644 src/integration_tests/carddav/snapshots/rustical__integration_tests__carddav__addressbook__multiget_body.snap.new diff --git a/crates/ical/src/error.rs b/crates/ical/src/error.rs index 94b41fe..0054467 100644 --- a/crates/ical/src/error.rs +++ b/crates/ical/src/error.rs @@ -1,7 +1,5 @@ use axum::{http::StatusCode, response::IntoResponse}; -use crate::CalDateTimeError; - #[derive(Debug, thiserror::Error, PartialEq, Eq)] pub enum Error { #[error("Invalid ics/vcf input: {0}")] @@ -15,12 +13,6 @@ pub enum Error { #[error(transparent)] ParserError(#[from] ical::parser::ParserError), - - #[error(transparent)] - CalDateTimeError(#[from] CalDateTimeError), - - #[error(transparent)] - RRuleError(#[from] rrule::RRuleError), } impl Error { @@ -30,7 +22,7 @@ impl Error { Self::InvalidData(_) | Self::MissingCalendar | Self::MissingContact => { StatusCode::BAD_REQUEST } - _ => StatusCode::INTERNAL_SERVER_ERROR, + Self::ParserError(_) => StatusCode::INTERNAL_SERVER_ERROR, } } } diff --git a/crates/ical/src/timestamp.rs b/crates/ical/src/timestamp.rs index 1e31191..4fd5eb7 100644 --- a/crates/ical/src/timestamp.rs +++ b/crates/ical/src/timestamp.rs @@ -4,24 +4,6 @@ use rustical_xml::{ValueDeserialize, ValueSerialize}; const UTC_DATE_TIME: &str = "%Y%m%dT%H%M%SZ"; -#[derive(Debug, thiserror::Error, PartialEq, Eq)] -pub enum CalDateTimeError { - #[error( - "Timezone has X-LIC-LOCATION property to specify a timezone from the Olson database, however its value {0} is invalid" - )] - InvalidOlson(String), - #[error("TZID {0} does not refer to a valid timezone")] - InvalidTZID(String), - #[error("Timestamp doesn't exist because of gap in local time")] - LocalTimeGap, - #[error("Datetime string {0} has an invalid format")] - InvalidDatetimeFormat(String), - #[error("Could not parse datetime {0}")] - ParseError(String), - #[error("Duration string {0} has an invalid format")] - InvalidDurationFormat(String), -} - #[derive(Debug, Clone, Deref, PartialEq, Eq, Hash)] pub struct UtcDateTime(pub DateTime); diff --git a/src/integration_tests/caldav/snapshots/rustical__integration_tests__caldav__calendar__get_body.snap.new b/src/integration_tests/caldav/snapshots/rustical__integration_tests__caldav__calendar__get_body.snap.new new file mode 100644 index 0000000..ebd639d --- /dev/null +++ b/src/integration_tests/caldav/snapshots/rustical__integration_tests__caldav__calendar__get_body.snap.new @@ -0,0 +1,14 @@ +--- +source: src/integration_tests/caldav/calendar.rs +assertion_line: 145 +expression: body +--- +BEGIN:VCALENDAR +VERSION:2.0 +PRODID:RustiCal Export +CALSCALE:GREGORIAN +X-WR-CALNAME:Calendar +X-WR-CALDESC:Description +X-WR-CALCOLOR:#00FF00 +X-WR-TIMEZONE:US/Eastern +END:VCALENDAR diff --git a/src/integration_tests/carddav/snapshots/rustical__integration_tests__carddav__addressbook__multiget_body.snap.new b/src/integration_tests/carddav/snapshots/rustical__integration_tests__carddav__addressbook__multiget_body.snap.new new file mode 100644 index 0000000..c509f45 --- /dev/null +++ b/src/integration_tests/carddav/snapshots/rustical__integration_tests__carddav__addressbook__multiget_body.snap.new @@ -0,0 +1,36 @@ +--- +source: src/integration_tests/carddav/addressbook.rs +assertion_line: 446 +expression: body +--- + + + + /carddav/principal/user/contacts/newcard.vcf + + + "ea0bf4a2ce7ef84606a4cf9235776dbc11b3e7ce351ddf35f27cbc0088acca7e" + BEGIN:VCARD +VERSION:3.0 +FN:Cyrus Daboo +N:Daboo;Cyrus +ADR;TYPE=POSTAL:;2822 Email HQ;Suite 2821;RFCVille;PA;15213;USA +EMAIL;TYPE=INTERNET,PREF:cyrus@example.com +NICKNAME:me +NOTE:Example VCard. +ORG:Self Employed +TEL;TYPE=WORK,VOICE:412 605 0499 +TEL;TYPE=FAX:412 605 0705 +URL:http://www.example.com +UID:1234-5678-9000-1 +END:VCARD + + + HTTP/1.1 200 OK + + + + /home/bernard/addressbook/vcf1.vcf + HTTP/1.1 404 Not Found + +