From cd1c566c8a68b097235e57267b8106ceee150e2a Mon Sep 17 00:00:00 2001
From: Ben Boeckel <mathstuf@gmail.com>
Date: Wed, 8 Apr 2020 22:44:04 -0400
Subject: error: remove the Result type alias

Instead, make a local type alias that can be used within the crate, but
avoid the need to export yet another symbol.
---
 src/icalendar.rs | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

(limited to 'src/icalendar.rs')

diff --git a/src/icalendar.rs b/src/icalendar.rs
index c49e193..4863029 100644
--- a/src/icalendar.rs
+++ b/src/icalendar.rs
@@ -1,4 +1,3 @@
-use std::result::Result as RResult;
 use std::collections::BTreeMap;
 
 use component::Component;
@@ -23,7 +22,7 @@ impl ICalendar {
     /// Returns an error if the parsed text is not a ICalendar (that means that an error is
     /// returned also if this is a valid Vcard!)
     ///
-    pub fn build(s: &str) -> Result<ICalendar> {
+    pub fn build(s: &str) -> VObjectResult<ICalendar> {
         let c = parse_component(s)?;
         Self::from_component(c).map_err(|_| VObjectErrorKind::NotAnICalendar(s.to_owned()))
     }
@@ -45,7 +44,7 @@ impl ICalendar {
     }
 
     /// Wrap a Component into a Vcard object, or don't do it if the Component is not a Vcard.
-    pub fn from_component(c: Component)-> RResult<ICalendar, Component> {
+    pub fn from_component(c: Component)-> Result<ICalendar, Component> {
         if c.name == "VCALENDAR" {
             Ok(ICalendar(c))
         } else {
@@ -99,7 +98,7 @@ impl<'a> EventIterator<'a> {
 }
 
 impl<'a> Iterator for EventIterator<'a> {
-    type Item = RResult<Event<'a>, &'a Component>;
+    type Item = Result<Event<'a>, &'a Component>;
 
     fn next(&mut self) -> Option<Self::Item> {
         self.0.next().map(Event::from_component)
@@ -111,7 +110,7 @@ impl<'a> Iterator for EventIterator<'a> {
 pub struct Event<'a>(&'a Component);
 
 impl<'a> Event<'a> {
-    fn from_component(c: &'a Component) -> RResult<Event<'a>, &'a Component> {
+    fn from_component(c: &'a Component) -> Result<Event<'a>, &'a Component> {
         if c.name == "VEVENT" {
             Ok(Event(c))
         } else {
@@ -160,13 +159,13 @@ pub enum Time {
 
 #[cfg(feature = "timeconversions")]
 pub trait AsDateTime {
-    fn as_datetime(&self) -> Result<Time>;
+    fn as_datetime(&self) -> VObjectResult<Time>;
 }
 
 #[cfg(feature = "timeconversions")]
 impl AsDateTime for Dtend {
 
-    fn as_datetime(&self) -> Result<Time> {
+    fn as_datetime(&self) -> VObjectResult<Time> {
         match NaiveDateTime::parse_from_str(&self.0, DATE_TIME_FMT) {
             Ok(dt) => Ok(Time::DateTime(dt)),
             Err(_) => NaiveDate::parse_from_str(&self.0, DATE_FMT)
@@ -180,7 +179,7 @@ impl AsDateTime for Dtend {
 #[cfg(feature = "timeconversions")]
 impl AsDateTime for Dtstart {
 
-    fn as_datetime(&self) -> Result<Time> {
+    fn as_datetime(&self) -> VObjectResult<Time> {
         match NaiveDateTime::parse_from_str(&self.0, DATE_TIME_FMT) {
             Ok(dt) => Ok(Time::DateTime(dt)),
             Err(_) => NaiveDate::parse_from_str(&self.0, DATE_FMT)
@@ -194,7 +193,7 @@ impl AsDateTime for Dtstart {
 #[cfg(feature = "timeconversions")]
 impl AsDateTime for Dtstamp {
 
-    fn as_datetime(&self) -> Result<Time> {
+    fn as_datetime(&self) -> VObjectResult<Time> {
         match NaiveDateTime::parse_from_str(&self.0, DATE_TIME_FMT) {
             Ok(dt) => Ok(Time::DateTime(dt)),
             Err(_) => NaiveDate::parse_from_str(&self.0, DATE_FMT)
-- 
cgit v1.2.3


From f08ee3c272ddf01b1025abb0c8a81fdd15a6bf52 Mon Sep 17 00:00:00 2001
From: Ben Boeckel <mathstuf@gmail.com>
Date: Wed, 8 Apr 2020 23:18:49 -0400
Subject: error: mark chrono parsing errors as an error source

---
 src/icalendar.rs | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

(limited to 'src/icalendar.rs')

diff --git a/src/icalendar.rs b/src/icalendar.rs
index 4863029..6a5fea2 100644
--- a/src/icalendar.rs
+++ b/src/icalendar.rs
@@ -166,12 +166,11 @@ pub trait AsDateTime {
 impl AsDateTime for Dtend {
 
     fn as_datetime(&self) -> VObjectResult<Time> {
-        match NaiveDateTime::parse_from_str(&self.0, DATE_TIME_FMT) {
-            Ok(dt) => Ok(Time::DateTime(dt)),
+        Ok(match NaiveDateTime::parse_from_str(&self.0, DATE_TIME_FMT) {
+            Ok(dt) => Time::DateTime(dt),
             Err(_) => NaiveDate::parse_from_str(&self.0, DATE_FMT)
-                .map(Time::Date)
-                .map_err(VObjectErrorKind::ChronoError),
-        }
+                .map(Time::Date)?,
+        })
     }
 
 }
@@ -180,12 +179,11 @@ impl AsDateTime for Dtend {
 impl AsDateTime for Dtstart {
 
     fn as_datetime(&self) -> VObjectResult<Time> {
-        match NaiveDateTime::parse_from_str(&self.0, DATE_TIME_FMT) {
-            Ok(dt) => Ok(Time::DateTime(dt)),
+        Ok(match NaiveDateTime::parse_from_str(&self.0, DATE_TIME_FMT) {
+            Ok(dt) => Time::DateTime(dt),
             Err(_) => NaiveDate::parse_from_str(&self.0, DATE_FMT)
-                .map(Time::Date)
-                .map_err(VObjectErrorKind::ChronoError),
-        }
+                .map(Time::Date)?,
+        })
     }
 
 }
@@ -194,12 +192,11 @@ impl AsDateTime for Dtstart {
 impl AsDateTime for Dtstamp {
 
     fn as_datetime(&self) -> VObjectResult<Time> {
-        match NaiveDateTime::parse_from_str(&self.0, DATE_TIME_FMT) {
-            Ok(dt) => Ok(Time::DateTime(dt)),
+        Ok(match NaiveDateTime::parse_from_str(&self.0, DATE_TIME_FMT) {
+            Ok(dt) => Time::DateTime(dt),
             Err(_) => NaiveDate::parse_from_str(&self.0, DATE_FMT)
-                .map(Time::Date)
-                .map_err(VObjectErrorKind::ChronoError),
-        }
+                .map(Time::Date)?,
+        })
     }
 
 }
-- 
cgit v1.2.3


From d0d8bde43fe1355a740c0f431f7b10f4a2715823 Mon Sep 17 00:00:00 2001
From: Ben Boeckel <mathstuf@gmail.com>
Date: Wed, 8 Apr 2020 23:19:37 -0400
Subject: error: rename from VObjectErrorKind to VObjectError

The type is a fully-fledged `impl Error` all on its own now.
---
 src/icalendar.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/icalendar.rs')

diff --git a/src/icalendar.rs b/src/icalendar.rs
index 6a5fea2..4da4802 100644
--- a/src/icalendar.rs
+++ b/src/icalendar.rs
@@ -24,7 +24,7 @@ impl ICalendar {
     ///
     pub fn build(s: &str) -> VObjectResult<ICalendar> {
         let c = parse_component(s)?;
-        Self::from_component(c).map_err(|_| VObjectErrorKind::NotAnICalendar(s.to_owned()))
+        Self::from_component(c).map_err(|_| VObjectError::NotAnICalendar(s.to_owned()))
     }
 
     pub fn empty() -> ICalendar {
-- 
cgit v1.2.3