summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNora <nora.widdecke@tu-bs.de>2019-03-10 17:14:36 +0100
committerNora <nora.widdecke@tu-bs.de>2019-03-10 17:14:36 +0100
commit1ffc0d1d39a6d5db5969c1af667bc412b195a97b (patch)
tree01aeeb7ca67f616f9700fc7c0457cbbe9ec7aecb
parentd63b58ec7386ea56eda396b44aaef8e074fe8636 (diff)
make clippy happy
-rw-r--r--src/actions/index/bucketable.rs3
-rw-r--r--src/cursorfile.rs1
-rw-r--r--src/khevent.rs5
-rw-r--r--src/khline.rs6
4 files changed, 4 insertions, 11 deletions
diff --git a/src/actions/index/bucketable.rs b/src/actions/index/bucketable.rs
index 74abcab..8644c1e 100644
--- a/src/actions/index/bucketable.rs
+++ b/src/actions/index/bucketable.rs
@@ -28,9 +28,10 @@ impl Bucketable for KhEvent {
let mut result: HashMap<String, Vec<String>> = HashMap::new();
let start_date: Date<Local> = self.get_start().ok_or_else(|| format!("Invalid DTSTART in {}", self.get_uid()))?.into();
+ //TODO
//let mut end_date: Date<Local> = self.get_end().map(|date| date.into()).unwrap_or(start_date);
- let mut end_date = self.get_last_relevant_date().map(|date| date.into()).unwrap_or(start_date);
+ let end_date = self.get_last_relevant_date().map(|date| date.into()).unwrap_or(start_date);
// end-dtimes are non-inclusive
// so in case of date-only events, the last day of the event is dtend-1
//if self.is_allday() {
diff --git a/src/cursorfile.rs b/src/cursorfile.rs
index b1b5c64..43c9979 100644
--- a/src/cursorfile.rs
+++ b/src/cursorfile.rs
@@ -3,7 +3,6 @@ use std::io;
use crate::defaults::*;
use crate::khline::KhLine;
-use crate::khevent::KhEvent;
use crate::utils::fileutil;
use crate::KhResult;
diff --git a/src/khevent.rs b/src/khevent.rs
index 5180270..bade6af 100644
--- a/src/khevent.rs
+++ b/src/khevent.rs
@@ -26,13 +26,10 @@ impl KhEvent {
pub fn get_end(&self) -> Option<IcalTime> {
//TODO: should probably depend on is_recur_master, not the instance timestamp
match self.instance_timestamp {
- Some(ref timestamp) => unsafe {
+ Some(ref timestamp) => {
let dur = self.get_duration().unwrap();
let dtend = timestamp.to_owned() + dur;
Some(dtend)
- //let icalduration = ical::icalcomponent_get_duration(self.event.ptr);
- //let dtend = ical::icaltime_add(**timestamp, icalduration);
- //Some(IcalTime::from(dtend))
},
None => self.event.get_dtend()
}
diff --git a/src/khline.rs b/src/khline.rs
index e37c367..3702fe5 100644
--- a/src/khline.rs
+++ b/src/khline.rs
@@ -33,12 +33,8 @@ impl KhLine {
pub fn to_event(&self) -> io::Result<KhEvent> {
let calendar = self.to_cal()?;
- let mut event = calendar.get_first_event();
+ let event = calendar.get_first_event();
Ok(KhEvent::from_event_with_timestamp(event, self.time.clone()))
- //if let Some(ref time) = self.time {
- //event = event.with_internal_timestamp(time);
- //}
- //Ok(event)
}
pub fn with_index(self, index: usize) -> Self {