From 23ff42901e99c9435c9276a128fadf342d264dc2 Mon Sep 17 00:00:00 2001
From: Jordan MacDonald <jordan@wastedintelligence.com>
Date: Sat, 6 Apr 2024 23:32:16 -0400
Subject: [PATCH 1/2] Use a plain array to store splash screen content

---
 src/presenters/modes/normal.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/presenters/modes/normal.rs b/src/presenters/modes/normal.rs
index d4264e60..4bbb6f8a 100644
--- a/src/presenters/modes/normal.rs
+++ b/src/presenters/modes/normal.rs
@@ -41,7 +41,7 @@ pub fn display(
 
         presenter.present()?;
     } else {
-        let content = vec![
+        let content = [
             format!("Amp v{}", env!("CARGO_PKG_VERSION")),
             String::from("© 2015-2024 Jordan MacDonald"),
             String::from(" "),

From 902609b7d8df796dc11fff9c34ad969967ff9580 Mon Sep 17 00:00:00 2001
From: Jordan MacDonald <jordan@wastedintelligence.com>
Date: Sat, 6 Apr 2024 23:37:47 -0400
Subject: [PATCH 2/2] Use ? operator instead of returning none

---
 src/models/application/preferences/mod.rs | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/models/application/preferences/mod.rs b/src/models/application/preferences/mod.rs
index fb48b42d..9898e5d6 100644
--- a/src/models/application/preferences/mod.rs
+++ b/src/models/application/preferences/mod.rs
@@ -321,13 +321,10 @@ impl Preferences {
         let extension = path_extension(Some(path))?;
 
         // Build a command using the command sub-key.
-        let Some(program) = self
+        let program = self
             .data
             .as_ref()
-            .and_then(|data| data[TYPES_KEY][extension][FORMAT_TOOL_KEY]["command"].as_str())
-        else {
-            return None;
-        };
+            .and_then(|data| data[TYPES_KEY][extension][FORMAT_TOOL_KEY]["command"].as_str())?;
         let mut command = process::Command::new(program);
 
         // Parse and add options to command, if present.