print all possible err of loading theme

extrawurst · Feb 20, 2024 · da610e7 · da610e7
1 parent 4c41e18
commit da610e7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/asyncgit/src/sync/commit.rs b/asyncgit/src/sync/commit.rs
@@ -121,7 +121,6 @@ pub fn tag_commit(
 
 #[cfg(test)]
 mod tests {
-
 	use crate::error::Result;
 	use crate::sync::tags::Tag;
 	use crate::sync::RepoPath;

diff --git a/src/ui/style.rs b/src/ui/style.rs
@@ -274,13 +274,7 @@ impl Theme {
 	fn load_patch(theme_path: &PathBuf) -> Result<ThemePatch> {
 		let file = File::open(theme_path)?;
 
-		let load_result = ron::de::from_reader(file);
-
-		if let Err(e) = &load_result {
-			log::error!("theme error [{:?}]: {e}", theme_path);
-		}
-
-		Ok(load_result?)
+		Ok(ron::de::from_reader(file)?)
 	}
 
 	fn load_old_theme(theme_path: &PathBuf) -> Result<Self> {
@@ -303,7 +297,10 @@ impl Theme {
 	pub fn init(theme_path: &PathBuf) -> Self {
 		let mut theme = Self::default();
 
-		if let Ok(patch) = Self::load_patch(theme_path) {
+		if let Ok(patch) = Self::load_patch(theme_path).map_err(|e| {
+			log::error!("theme error [{:?}]: {e}", theme_path);
+			e
+		}) {
 			theme.apply(patch);
 		} else if let Ok(old_theme) = Self::load_old_theme(theme_path)
 		{