From bee9d45dd32af6da7018a5f7afaa010a46db97b6 Mon Sep 17 00:00:00 2001 From: Paul Delafosse Date: Thu, 12 May 2022 23:47:33 +0200 Subject: [PATCH] chore: return Vec instead of Option for Direcories --- src/theme/parse.rs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/theme/parse.rs b/src/theme/parse.rs index 65bb607..55aa6e2 100644 --- a/src/theme/parse.rs +++ b/src/theme/parse.rs @@ -5,17 +5,17 @@ use ini::Properties; impl Theme { pub(super) fn get_all_directories(&self) -> Vec { self.directories() - .unwrap_or_default() .iter() .filter_map(|name| self.get_directory(name)) .collect() } // TODO: use me - fn scaled_directories(&self) -> Option> { + fn scaled_directories(&self) -> Vec<&str> { self.get_icon_theme_section() .and_then(|props| props.get("ScaledDirectories")) .map(|dirs| dirs.split(',').collect()) + .unwrap_or(vec![]) } fn get_icon_theme_section(&self) -> Option<&Properties> { @@ -27,11 +27,12 @@ impl Theme { .and_then(|props| props.get("Inherits")) } - fn directories(&self) -> Option> { + fn directories(&self) -> Vec<&str> { self.index .section(Some("Icon Theme")) .and_then(|props| props.get("Directories")) .map(|dirs| dirs.split(',').collect()) + .unwrap_or(vec![]) } fn get_directory<'a>(&'a self, name: &'a str) -> Option {