apps/*: remove unnecessary Ok() wrapping

waynr · Apr 11, 2023 · f4b1aff · f4b1aff
1 parent f360785
commit f4b1aff
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 19 deletions.
diff --git a/dfiles-apps/chrome/src/main.rs b/dfiles-apps/chrome/src/main.rs
@@ -97,7 +97,7 @@ impl Chrome {
         let home_dir = format!("{}/.config", home);
         let version = env!("CARGO_PKG_VERSION");
 
-        Ok(ContainerManager::default_debian(
+        ContainerManager::default_debian(
             "chrome".to_string(),
             vec![format!("waynr/chrome:{}", version)],
             vec![home_dir, data_dir.clone()],
@@ -118,7 +118,7 @@ impl Chrome {
                 .collect(),
             Some(String::from("bullseye")),
         )
-        .context("initializing chrome container manager")?)
+        .context("initializing chrome container manager")
     }
 }
 

diff --git a/dfiles-apps/discord/src/main.rs b/dfiles-apps/discord/src/main.rs
@@ -49,7 +49,7 @@ impl Discord {
 
         let version = env!("CARGO_PKG_VERSION");
 
-        Ok(ContainerManager::default_debian(
+        ContainerManager::default_debian(
             "discord".to_string(),
             vec![format!("{}:{}", "waynr/discord", version)],
             vec![container_path],
@@ -67,7 +67,7 @@ impl Discord {
             vec!["discord"].into_iter().map(String::from).collect(),
             None,
         )
-        .context("initializing discord container manager")?)
+        .context("initializing discord container manager")
     }
 }
 

diff --git a/dfiles-apps/drawio/src/main.rs b/dfiles-apps/drawio/src/main.rs
@@ -47,7 +47,7 @@ impl Drawio {
 
         let version = env!("CARGO_PKG_VERSION");
 
-        Ok(ContainerManager::default_debian(
+        ContainerManager::default_debian(
             "drawio".to_string(),
             vec![format!("{}:{}", "waynr/drawio", version)],
             vec![container_path],
@@ -63,7 +63,7 @@ impl Drawio {
             vec!["drawio"].into_iter().map(String::from).collect(),
             None,
         )
-        .context("initializing drawio container manager")?)
+        .context("initializing drawio container manager")
     }
 }
 

diff --git a/dfiles-apps/firefox/src/main.rs b/dfiles-apps/firefox/src/main.rs
@@ -49,7 +49,7 @@ impl Firefox {
         let home = env::var("HOME").expect("HOME must be set");
         let container_path = format!("{}/.mozilla/firefox/profile", home);
 
-        Ok(ContainerManager::default_debian(
+        ContainerManager::default_debian(
             "firefox".to_string(),
             vec![format!("{}:{}", "waynr/firefox", VERSION)],
             vec![container_path.clone()],
@@ -74,7 +74,7 @@ impl Firefox {
             .collect(),
             Some(String::from("bookworm")),
         )
-        .context("initializing firefox container manager")?)
+        .context("initializing firefox container manager")
     }
 }
 

diff --git a/dfiles-apps/signal/src/main.rs b/dfiles-apps/signal/src/main.rs
@@ -49,7 +49,7 @@ impl Signal {
         let home = env::var("HOME").expect("HOME must be set");
         let container_path = format!("{}/.config/Signal/", home);
 
-        Ok(ContainerManager::default_debian(
+        ContainerManager::default_debian(
             "signal".to_string(),
             vec![String::from("waynr/signal:v0")],
             vec![container_path],
@@ -69,7 +69,7 @@ impl Signal {
                 .collect(),
             None,
         )
-        .context("initializing signal container manager")?)
+        .context("initializing signal container manager")
     }
 }
 

diff --git a/dfiles-apps/skype/src/main.rs b/dfiles-apps/skype/src/main.rs
@@ -102,7 +102,7 @@ impl Skype {
 
         let version = env!("CARGO_PKG_VERSION");
 
-        Ok(ContainerManager::default_debian(
+        ContainerManager::default_debian(
             "skype".to_string(),
             vec![format!("{}:{}", "waynr/skype", version)],
             vec![container_path],
@@ -123,7 +123,7 @@ impl Skype {
                 .collect(),
             None,
         )
-        .context("initializing skype container manager")?)
+        .context("initializing skype container manager")
     }
 }
 

diff --git a/dfiles-apps/steam/src/main.rs b/dfiles-apps/steam/src/main.rs
@@ -37,7 +37,7 @@ impl Steam {
 
         let version = env!("CARGO_PKG_VERSION");
 
-        Ok(ContainerManager::default_debian(
+        ContainerManager::default_debian(
             "steam".to_string(),
             vec![format!("{}:{}", "waynr/steam", version)],
             vec![container_path],
@@ -58,7 +58,7 @@ impl Steam {
                 .collect(),
             None,
         )
-        .context("initializing steam container manager")?)
+        .context("initializing steam container manager")
     }
 }
 

diff --git a/dfiles-apps/thinkorswim/src/main.rs b/dfiles-apps/thinkorswim/src/main.rs
@@ -72,7 +72,7 @@ impl Thinkorswim {
         };
 
         let thinkorswim_install_dir = format!("{}/thinkorswim", home);
-        Ok(ContainerManager::default_debian(
+        ContainerManager::default_debian(
             "thinkorswim".to_string(),
             vec![format!("{}:{}", "waynr/thinkorswim", version)],
             vec![
@@ -98,7 +98,7 @@ impl Thinkorswim {
             vec![format!("{}/thinkorswim", thinkorswim_install_dir)],
             Some(String::from("bullseye")),
         )
-        .context("initializing thinkorswim container manager")?)
+        .context("initializing thinkorswim container manager")
     }
 }
 

diff --git a/dfiles-apps/zoom/src/main.rs b/dfiles-apps/zoom/src/main.rs
@@ -34,7 +34,7 @@ impl Zoom {
 
         let version = env!("CARGO_PKG_VERSION");
 
-        Ok(ContainerManager::default_debian(
+        ContainerManager::default_debian(
             "zoom".to_string(),
             vec![format!("{}:{}", "waynr/zoom", version)],
             vec![
@@ -55,7 +55,7 @@ impl Zoom {
             vec!["zoom"].into_iter().map(String::from).collect(),
             None,
         )
-        .context("initializing zoom container manager")?)
+        .context("initializing zoom container manager")
     }
 }
 

diff --git a/src/dfiles/config.rs b/src/dfiles/config.rs
@@ -205,7 +205,7 @@ fn merge<T: Clone>(
     }
 }
 
-pub fn cli_args<'a, 'b>() -> Vec<Arg> {
+pub fn cli_args() -> Vec<Arg> {
     vec![
         Arg::new("mount")
             .short('m')