From 56d37f135536c7d17ab98c6671094925dee64a5e Mon Sep 17 00:00:00 2001 From: Hristo Venev Date: Sat, 28 Sep 2019 18:20:33 +0000 Subject: I don't like `if let` that much. --- src/manager/updater.rs | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) (limited to 'src/manager/updater.rs') diff --git a/src/manager/updater.rs b/src/manager/updater.rs index 0de675c..14d55fc 100644 --- a/src/manager/updater.rs +++ b/src/manager/updater.rs @@ -19,20 +19,15 @@ impl Updater { } fn cache_path(&self, s: &Source) -> Option { - if let Some(ref dir) = self.config.cache_directory { - let mut p = dir.clone(); - p.push(&s.name); - Some(p) - } else { - None - } + let mut p = self.config.cache_directory.as_ref()?.clone(); + p.push(&s.name); + Some(p) } fn cache_update(&self, src: &Source) { - let path = if let Some(path) = self.cache_path(src) { - path - } else { - return; + let path = match self.cache_path(src) { + Some(v) => v, + None => return, }; let data = serde_json::to_vec(&src.data).unwrap(); @@ -45,10 +40,9 @@ impl Updater { } pub fn cache_load(&self, src: &mut Source) -> bool { - let path = if let Some(path) = self.cache_path(src) { - path - } else { - return false; + let path = match self.cache_path(src) { + Some(v) => v, + None => return false, }; let data = match load_file(&path) { -- cgit