diff options
| author | Nora <nora.widdecke@tu-bs.de> | 2019-01-03 00:09:12 +0100 |
|---|---|---|
| committer | Nora <nora.widdecke@tu-bs.de> | 2019-01-03 00:38:12 +0100 |
| commit | 1550edd7dfdbc87a30f44d6c93dcf419dd5ef104 (patch) | |
| tree | 5222ecf78eaeb060b7d9b9a2dc8948561a339e62 | |
| parent | 269892f7d2b84bb9d0de729a0046319b64ef673d (diff) | |
replace e.g. unwrap_or with unwrap_or_else, where required by clippy
| -rw-r--r-- | src/agenda.rs | 2 | ||||
| -rw-r--r-- | src/bucketable.rs | 4 | ||||
| -rw-r--r-- | src/edit.rs | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/agenda.rs b/src/agenda.rs index 466deaa..9149d1c 100644 --- a/src/agenda.rs +++ b/src/agenda.rs @@ -19,7 +19,7 @@ pub fn show_events(config: Config, lines: &mut Iterator<Item = String>) { Some((_, _, event, _)) => { event .get_dtstart() - .unwrap_or(Local.timestamp(0, 0)) + .unwrap_or_else(|| Local.timestamp(0, 0)) .date() } None => return, diff --git a/src/bucketable.rs b/src/bucketable.rs index 771daf5..f94c9fa 100644 --- a/src/bucketable.rs +++ b/src/bucketable.rs @@ -24,7 +24,7 @@ impl Bucketable for IcalVEvent { fn get_buckets(&self) -> Result<HashMap<String, Vec<String>>, String> { let mut result: HashMap<String, Vec<String>> = HashMap::new(); - let start_date = self.get_dtstart_date().ok_or(format!("Invalid DTSTART in {}", self.get_uid()))?; + let start_date = self.get_dtstart_date().ok_or_else(|| format!("Invalid DTSTART in {}", self.get_uid()))?; let mut end_date = self.get_dtend_date().unwrap_or(start_date); // end-dtimes are non-inclusive @@ -38,7 +38,7 @@ impl Bucketable for IcalVEvent { result .entry(bucketid) .and_modify(|items| items.push(self.get_khaleesi_line().unwrap())) - .or_insert(vec!(self.get_khaleesi_line().unwrap())); + .or_insert_with(|| vec!(self.get_khaleesi_line().unwrap())); } if self.has_recur() { diff --git a/src/edit.rs b/src/edit.rs index bcbf09b..4d87f7f 100644 --- a/src/edit.rs +++ b/src/edit.rs @@ -16,7 +16,7 @@ pub fn do_edit(filenames: &mut Iterator<Item = String>, _args: &[String]) { paths.sort_unstable(); paths.dedup(); - let editor = env::var("EDITOR").unwrap_or("vim".to_string()); + let editor = env::var("EDITOR").unwrap_or_else(|_| "vim".to_string()); Command::new(&editor) .args(paths) |