From d74f0ba660547f55664db645c4f55478d42dcbce Mon Sep 17 00:00:00 2001 From: Lennart <18233294+lennart-k@users.noreply.github.com> Date: Wed, 15 Jan 2025 18:15:04 +0100 Subject: [PATCH] xml: Rename XmlDeError to XmlError --- .../methods/report/sync_collection.rs | 4 ++-- crates/caldav/src/error.rs | 2 +- .../methods/report/sync_collection.rs | 4 ++-- crates/carddav/src/error.rs | 2 +- crates/dav/src/error.rs | 2 +- crates/dav/src/push/push_notifier.rs | 1 - crates/store/src/calendar/timestamp.rs | 4 ++-- crates/xml/derive/src/field.rs | 2 +- crates/xml/derive/src/xml_enum.rs | 24 +++++++++---------- crates/xml/derive/src/xml_struct.rs | 18 +++++++------- crates/xml/src/de.rs | 16 ++++++------- crates/xml/src/error.rs | 2 +- crates/xml/src/lib.rs | 8 +++---- crates/xml/src/value.rs | 16 ++++++------- 14 files changed, 52 insertions(+), 53 deletions(-) diff --git a/crates/caldav/src/calendar/methods/report/sync_collection.rs b/crates/caldav/src/calendar/methods/report/sync_collection.rs index adf5156..17dbe7c 100644 --- a/crates/caldav/src/calendar/methods/report/sync_collection.rs +++ b/crates/caldav/src/calendar/methods/report/sync_collection.rs @@ -23,12 +23,12 @@ pub(crate) enum SyncLevel { } impl ValueDeserialize for SyncLevel { - fn deserialize(val: &str) -> Result { + fn deserialize(val: &str) -> Result { Ok(match val { "1" => Self::One, "Infinity" => Self::Infinity, _ => { - return Err(rustical_xml::XmlDeError::Other( + return Err(rustical_xml::XmlError::Other( "Invalid sync-level".to_owned(), )) } diff --git a/crates/caldav/src/error.rs b/crates/caldav/src/error.rs index f5c9658..955c2e9 100644 --- a/crates/caldav/src/error.rs +++ b/crates/caldav/src/error.rs @@ -19,7 +19,7 @@ pub enum Error { DavError(#[from] rustical_dav::Error), #[error(transparent)] - XmlDecodeError(#[from] rustical_xml::XmlDeError), + XmlDecodeError(#[from] rustical_xml::XmlError), #[error(transparent)] Other(#[from] anyhow::Error), diff --git a/crates/carddav/src/addressbook/methods/report/sync_collection.rs b/crates/carddav/src/addressbook/methods/report/sync_collection.rs index 80e204d..2d2ea85 100644 --- a/crates/carddav/src/addressbook/methods/report/sync_collection.rs +++ b/crates/carddav/src/addressbook/methods/report/sync_collection.rs @@ -22,12 +22,12 @@ pub(crate) enum SyncLevel { } impl ValueDeserialize for SyncLevel { - fn deserialize(val: &str) -> Result { + fn deserialize(val: &str) -> Result { Ok(match val { "1" => Self::One, "Infinity" => Self::Infinity, _ => { - return Err(rustical_xml::XmlDeError::Other( + return Err(rustical_xml::XmlError::Other( "Invalid sync-level".to_owned(), )) } diff --git a/crates/carddav/src/error.rs b/crates/carddav/src/error.rs index f5c9658..955c2e9 100644 --- a/crates/carddav/src/error.rs +++ b/crates/carddav/src/error.rs @@ -19,7 +19,7 @@ pub enum Error { DavError(#[from] rustical_dav::Error), #[error(transparent)] - XmlDecodeError(#[from] rustical_xml::XmlDeError), + XmlDecodeError(#[from] rustical_xml::XmlError), #[error(transparent)] Other(#[from] anyhow::Error), diff --git a/crates/dav/src/error.rs b/crates/dav/src/error.rs index bdb33d1..8863129 100644 --- a/crates/dav/src/error.rs +++ b/crates/dav/src/error.rs @@ -20,7 +20,7 @@ pub enum Error { PropReadOnly, #[error(transparent)] - XmlDeserializationError(#[from] rustical_xml::XmlDeError), + XmlDeserializationError(#[from] rustical_xml::XmlError), #[error(transparent)] IOError(#[from] std::io::Error), diff --git a/crates/dav/src/push/push_notifier.rs b/crates/dav/src/push/push_notifier.rs index f8f5f2d..867cf11 100644 --- a/crates/dav/src/push/push_notifier.rs +++ b/crates/dav/src/push/push_notifier.rs @@ -1,6 +1,5 @@ use crate::xml::multistatus::PropstatElement; use actix_web::http::StatusCode; -use reqwest::Url; use rustical_store::{CollectionOperation, CollectionOperationType, SubscriptionStore}; use rustical_xml::{XmlRootTag, XmlSerialize, XmlSerializeRoot}; use std::sync::Arc; diff --git a/crates/store/src/calendar/timestamp.rs b/crates/store/src/calendar/timestamp.rs index c218349..d8a4c0e 100644 --- a/crates/store/src/calendar/timestamp.rs +++ b/crates/store/src/calendar/timestamp.rs @@ -22,12 +22,12 @@ pub const LOCAL_DATE: &str = "%Y%m%d"; pub struct UtcDateTime(DateTime); impl ValueDeserialize for UtcDateTime { - fn deserialize(val: &str) -> Result { + fn deserialize(val: &str) -> Result { let input = ::deserialize(val)?; Ok(Self( NaiveDateTime::parse_from_str(&input, UTC_DATE_TIME) .map_err(|_| { - rustical_xml::XmlDeError::Other("Could not parse as UTC timestamp".to_owned()) + rustical_xml::XmlError::Other("Could not parse as UTC timestamp".to_owned()) })? .and_utc(), )) diff --git a/crates/xml/derive/src/field.rs b/crates/xml/derive/src/field.rs index bd51294..9973c2a 100644 --- a/crates/xml/derive/src/field.rs +++ b/crates/xml/derive/src/field.rs @@ -158,7 +158,7 @@ impl Field { (false, false, true) => quote! { builder.#builder_field_ident }, (false, false, false) => { let field_ident = self.field_ident().into_token_stream().to_string(); - quote! { builder.#builder_field_ident.ok_or(::rustical_xml::XmlDeError::MissingField(#field_ident))? } + quote! { builder.#builder_field_ident.ok_or(::rustical_xml::XmlError::MissingField(#field_ident))? } } }; quote! { #target_field_index: #builder_value } diff --git a/crates/xml/derive/src/xml_enum.rs b/crates/xml/derive/src/xml_enum.rs index be0decc..9232eca 100644 --- a/crates/xml/derive/src/xml_enum.rs +++ b/crates/xml/derive/src/xml_enum.rs @@ -28,10 +28,10 @@ impl Enum { reader: &mut quick_xml::NsReader, start: &quick_xml::events::BytesStart, empty: bool - ) -> Result { + ) -> Result { #(#variant_branches);* - Err(rustical_xml::XmlDeError::InvalidVariant("could not match".to_owned())) + Err(rustical_xml::XmlError::InvalidVariant("could not match".to_owned())) } } } @@ -49,14 +49,14 @@ impl Enum { reader: &mut quick_xml::NsReader, start: &quick_xml::events::BytesStart, empty: bool - ) -> Result { + ) -> Result { let (_ns, name) = reader.resolve_element(start.name()); match name.as_ref() { #(#variant_branches),* name => { // Handle invalid variant name - Err(rustical_xml::XmlDeError::InvalidVariant(String::from_utf8_lossy(name).to_string())) + Err(rustical_xml::XmlError::InvalidVariant(String::from_utf8_lossy(name).to_string())) } } } @@ -150,7 +150,7 @@ impl Enum { quote! { impl #impl_generics ::rustical_xml::XmlDocument for #ident #type_generics #where_clause { - fn parse(mut reader: ::quick_xml::NsReader) -> Result + fn parse(mut reader: ::quick_xml::NsReader) -> Result where Self: ::rustical_xml::XmlDeserialize { @@ -166,26 +166,26 @@ impl Enum { return ::deserialize(&mut reader, &start, empty); } - Event::Eof => return Err(::rustical_xml::XmlDeError::Eof), + Event::Eof => return Err(::rustical_xml::XmlError::Eof), Event::Text(bytes_text) => { - return Err(::rustical_xml::XmlDeError::UnsupportedEvent("Text")); + return Err(::rustical_xml::XmlError::UnsupportedEvent("Text")); } Event::CData(cdata) => { - return Err(::rustical_xml::XmlDeError::UnsupportedEvent("CDATA")); + return Err(::rustical_xml::XmlError::UnsupportedEvent("CDATA")); } Event::Comment(_) => { /* ignore */ } Event::Decl(_) => { /* ignore */ - // return Err(::rustical_xml::XmlDeError::UnsupportedEvent("Declaration")); + // return Err(::rustical_xml::XmlError::UnsupportedEvent("Declaration")); } Event::PI(_) => { - return Err(::rustical_xml::XmlDeError::UnsupportedEvent("Processing instruction")); + return Err(::rustical_xml::XmlError::UnsupportedEvent("Processing instruction")); } Event::DocType(doctype) => { - return Err(::rustical_xml::XmlDeError::UnsupportedEvent("Doctype in the middle of the document")); + return Err(::rustical_xml::XmlError::UnsupportedEvent("Doctype in the middle of the document")); } Event::End(end) => { - return Err(::rustical_xml::XmlDeError::UnsupportedEvent("Premature end")); + return Err(::rustical_xml::XmlError::UnsupportedEvent("Premature end")); } }; } diff --git a/crates/xml/derive/src/xml_struct.rs b/crates/xml/derive/src/xml_struct.rs index 6bfafbb..f38c002 100644 --- a/crates/xml/derive/src/xml_struct.rs +++ b/crates/xml/derive/src/xml_struct.rs @@ -11,7 +11,7 @@ fn invalid_field_branch(ident: &syn::Ident, allow: bool) -> proc_macro2::TokenSt quote! {} } else { quote! { - return Err(XmlDeError::InvalidFieldName(#ident, format!("[{ns:?}]{tag}", tag = String::from_utf8_lossy(tag)))) } + return Err(XmlError::InvalidFieldName(#ident, format!("[{ns:?}]{tag}", tag = String::from_utf8_lossy(tag)))) } } } @@ -130,9 +130,9 @@ impl NamedStruct { reader: &mut quick_xml::NsReader, start: &quick_xml::events::BytesStart, empty: bool - ) -> Result { + ) -> Result { use quick_xml::events::Event; - use rustical_xml::XmlDeError; + use rustical_xml::XmlError; let mut buf = Vec::new(); @@ -163,7 +163,7 @@ impl NamedStruct { Event::End(e) if e.name() == start.name() => { break; } - Event::Eof => return Err(XmlDeError::Eof), + Event::Eof => return Err(XmlError::Eof), // start of a child element Event::Start(start) | Event::Empty(start) => { let empty = matches!(event, Event::Empty(_)); @@ -179,24 +179,24 @@ impl NamedStruct { #(#text_field_branches)* } Event::CData(cdata) => { - return Err(XmlDeError::UnsupportedEvent("CDATA")); + return Err(XmlError::UnsupportedEvent("CDATA")); } Event::Comment(_) => { /* ignore */ } Event::Decl(_) => { // Error: not supported - return Err(XmlDeError::UnsupportedEvent("Declaration")); + return Err(XmlError::UnsupportedEvent("Declaration")); } Event::PI(_) => { // Error: not supported - return Err(XmlDeError::UnsupportedEvent("Processing instruction")); + return Err(XmlError::UnsupportedEvent("Processing instruction")); } Event::DocType(doctype) => { // Error: start of new document - return Err(XmlDeError::UnsupportedEvent("Doctype in the middle of the document")); + return Err(XmlError::UnsupportedEvent("Doctype in the middle of the document")); } Event::End(end) => { // Error: premature end - return Err(XmlDeError::Other("Unexpected closing tag for wrong element".to_owned())); + return Err(XmlError::Other("Unexpected closing tag for wrong element".to_owned())); } } } diff --git a/crates/xml/src/de.rs b/crates/xml/src/de.rs index ec0b779..fcdcb3f 100644 --- a/crates/xml/src/de.rs +++ b/crates/xml/src/de.rs @@ -4,7 +4,7 @@ use std::io::BufRead; pub use xml_derive::XmlDeserialize; pub use xml_derive::XmlDocument; -use crate::XmlDeError; +use crate::XmlError; use crate::XmlRootTag; pub trait XmlDeserialize: Sized { @@ -12,14 +12,14 @@ pub trait XmlDeserialize: Sized { reader: &mut quick_xml::NsReader, start: &BytesStart, empty: bool, - ) -> Result; + ) -> Result; } pub trait XmlDocument: XmlDeserialize { - fn parse(reader: quick_xml::NsReader) -> Result; + fn parse(reader: quick_xml::NsReader) -> Result; #[inline] - fn parse_reader(input: R) -> Result + fn parse_reader(input: R) -> Result where Self: XmlDeserialize, { @@ -29,13 +29,13 @@ pub trait XmlDocument: XmlDeserialize { } #[inline] - fn parse_str(s: &str) -> Result { + fn parse_str(s: &str) -> Result { Self::parse_reader(s.as_bytes()) } } impl XmlDocument for T { - fn parse(mut reader: quick_xml::NsReader) -> Result + fn parse(mut reader: quick_xml::NsReader) -> Result where Self: XmlDeserialize, { @@ -57,7 +57,7 @@ impl XmlDocument for T { }; if !matches { let root_ns = Self::root_ns(); - return Err(XmlDeError::InvalidTag( + return Err(XmlError::InvalidTag( format!("{ns:?}"), String::from_utf8_lossy(name.as_ref()).to_string(), format!("{root_ns:?}"), @@ -67,7 +67,7 @@ impl XmlDocument for T { return Self::deserialize(&mut reader, &start, empty); } - _ => return Err(XmlDeError::UnsupportedEvent("unknown, todo")), + _ => return Err(XmlError::UnsupportedEvent("unknown, todo")), }; } } diff --git a/crates/xml/src/error.rs b/crates/xml/src/error.rs index a4d1ab0..36db07d 100644 --- a/crates/xml/src/error.rs +++ b/crates/xml/src/error.rs @@ -1,7 +1,7 @@ use thiserror::Error; #[derive(Debug, Error)] -pub enum XmlDeError { +pub enum XmlError { #[error(transparent)] QuickXmlError(#[from] quick_xml::Error), #[error(transparent)] diff --git a/crates/xml/src/lib.rs b/crates/xml/src/lib.rs index 3df20b0..a5481f2 100644 --- a/crates/xml/src/lib.rs +++ b/crates/xml/src/lib.rs @@ -10,7 +10,7 @@ mod value; pub use de::XmlDeserialize; pub use de::XmlDocument; -pub use error::XmlDeError; +pub use error::XmlError; pub use se::XmlSerialize; pub use se::XmlSerializeRoot; pub use value::{ParseValueError, ValueDeserialize, ValueSerialize}; @@ -21,7 +21,7 @@ impl XmlDeserialize for () { reader: &mut quick_xml::NsReader, start: &BytesStart, empty: bool, - ) -> Result { + ) -> Result { if empty { return Ok(()); } @@ -29,7 +29,7 @@ impl XmlDeserialize for () { loop { match reader.read_event_into(&mut buf)? { Event::End(e) if e.name() == start.name() => return Ok(()), - Event::Eof => return Err(XmlDeError::Eof), + Event::Eof => return Err(XmlError::Eof), _ => {} }; } @@ -91,7 +91,7 @@ impl XmlDeserialize for Unparsed { reader: &mut quick_xml::NsReader, start: &BytesStart, empty: bool, - ) -> Result { + ) -> Result { // let reader_cloned = NsReader::from_reader(reader.get_ref().to_owned()); if !empty { let mut buf = vec![]; diff --git a/crates/xml/src/value.rs b/crates/xml/src/value.rs index 63fa1f6..e9f0966 100644 --- a/crates/xml/src/value.rs +++ b/crates/xml/src/value.rs @@ -5,7 +5,7 @@ use std::num::{ParseFloatError, ParseIntError}; use std::{convert::Infallible, io::BufRead}; use thiserror::Error; -use crate::{XmlDeError, XmlDeserialize, XmlSerialize}; +use crate::{XmlError, XmlDeserialize, XmlSerialize}; #[derive(Debug, Error)] pub enum ParseValueError { @@ -22,7 +22,7 @@ pub trait ValueSerialize: Sized { } pub trait ValueDeserialize: Sized { - fn deserialize(val: &str) -> Result; + fn deserialize(val: &str) -> Result; } macro_rules! impl_value_parse { @@ -34,10 +34,10 @@ macro_rules! impl_value_parse { } impl ValueDeserialize for $t { - fn deserialize(val: &str) -> Result { + fn deserialize(val: &str) -> Result { val.parse() .map_err(ParseValueError::from) - .map_err(XmlDeError::from) + .map_err(XmlError::from) } } }; @@ -68,7 +68,7 @@ impl XmlDeserialize for T { reader: &mut quick_xml::NsReader, _start: &BytesStart, empty: bool, - ) -> Result { + ) -> Result { let mut string = String::new(); if !empty { @@ -78,13 +78,13 @@ impl XmlDeserialize for T { Event::Text(text) => { if !string.is_empty() { // Content already written - return Err(XmlDeError::UnsupportedEvent("content already written")); + return Err(XmlError::UnsupportedEvent("content already written")); } string = String::from_utf8_lossy(text.as_ref()).to_string(); } Event::End(_) => break, - Event::Eof => return Err(XmlDeError::Eof), - _ => return Err(XmlDeError::UnsupportedEvent("todo")), + Event::Eof => return Err(XmlError::Eof), + _ => return Err(XmlError::UnsupportedEvent("todo")), }; } }