From 614b9c5547b3de07b7fe41aeb6425521671d8844 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Fri, 20 Dec 2019 11:34:46 +0100
Subject: Remove From implementation that issues implicit clone() call

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 src/time.rs | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/time.rs b/src/time.rs
index 2fe4a33..37f0e84 100644
--- a/src/time.rs
+++ b/src/time.rs
@@ -159,12 +159,6 @@ impl Add<IcalDuration> for IcalTime {
     }
 }
 
-impl<T: Into<IcalTime> + Clone> From<&T> for IcalTime {
-    fn from(time: &T) -> IcalTime {
-        time.clone().into()
-    }
-}
-
 impl From<DateTime<Local>> for IcalTime {
     fn from(time: DateTime<Local>) -> IcalTime {
         let timestamp = time.timestamp();
-- 
cgit v1.2.3


From 0a9cde994e64cebdad568dc2303b89cfcb3ba007 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Fri, 20 Dec 2019 12:33:25 +0100
Subject: Rename: IcalVCalendar::with_normalize() -> ::normalized()

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 src/vcalendar.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vcalendar.rs b/src/vcalendar.rs
index 09752d5..82e4179 100644
--- a/src/vcalendar.rs
+++ b/src/vcalendar.rs
@@ -91,7 +91,7 @@ impl IcalVCalendar {
         }
     }
 
-    pub fn with_normalize(self) -> Self {
+    pub fn normalized(self) -> Self {
         unsafe {
             ical::icalcomponent_normalize(self.get_ptr());
         }
-- 
cgit v1.2.3


From dc6c4d67a3a6a4a17b415ace80b1eb10f7fe5041 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Fri, 20 Dec 2019 12:34:42 +0100
Subject: Implement ToString rather than providing own ::to_string() function

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 src/vcalendar.rs | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/vcalendar.rs b/src/vcalendar.rs
index 82e4179..9daf452 100644
--- a/src/vcalendar.rs
+++ b/src/vcalendar.rs
@@ -2,6 +2,7 @@ use std::ffi::{CStr, CString};
 use std::io;
 use std::path::{Path, PathBuf};
 use std::rc::Rc;
+use std::string::ToString;
 
 use super::IcalComponent;
 use super::IcalTime;
@@ -98,13 +99,6 @@ impl IcalVCalendar {
         self
     }
 
-    pub fn to_string(&self) -> String {
-        unsafe {
-            let ical_cstr = CStr::from_ptr(ical::icalcomponent_as_ical_string(self.get_ptr()));
-            ical_cstr.to_string_lossy().into_owned()
-        }
-    }
-
     pub fn get_uid(&self) -> String {
         unsafe {
             let uid_cstr = CStr::from_ptr(ical::icalcomponent_get_uid(
@@ -358,6 +352,15 @@ impl IcalVCalendar {
     }
 }
 
+impl ToString for IcalVCalendar {
+    fn to_string(&self) -> String {
+        unsafe {
+            let ical_cstr = CStr::from_ptr(ical::icalcomponent_as_ical_string(self.get_ptr()));
+            ical_cstr.to_string_lossy().into_owned()
+        }
+    }
+}
+
 impl<'a> IcalEventIter<'a> {
     fn from_vcalendar(cal: &'a IcalVCalendar) -> Self {
         let vevent_kind = ical::icalcomponent_kind_ICAL_VEVENT_COMPONENT;
-- 
cgit v1.2.3