refactor

Deduplicate

src/haiku.rs

@@ -8,11 +8,6 @@ pub fn commands<T: AsRef<OsStr>>(path: T) -> Vec<Command> {
     vec![cmd]
 }
 
-pub fn that<T: AsRef<OsStr>>(path: T) -> io::Result<()> {
-    let cmd = &mut commands(path)[0];
-    cmd.status_without_output().into_result(cmd)
-}
-
 pub fn with<T: AsRef<OsStr>>(path: T, app: impl Into<String>) -> io::Result<()> {
     let mut cmd = Command::new(app.into());
     cmd.arg(path.as_ref())

src/ios.rs

@@ -8,11 +8,6 @@ pub fn commands<T: AsRef<OsStr>>(path: T) -> Vec<Command> {
     vec![cmd]
 }
 
-pub fn that<T: AsRef<OsStr>>(path: T) -> io::Result<()> {
-    let cmd = &mut commands(path)[0];
-    cmd.status_without_output().into_result(cmd)
-}
-
 pub fn with<T: AsRef<OsStr>>(path: T, app: impl Into<String>) -> io::Result<()> {
     let mut cmd = Command::new("uiopen");
     cmd.arg("--url")

src/lib.rs

@@ -114,7 +114,16 @@ use std::{
 /// Sometimes, depending on the platform and system configuration, launchers *can* block.
 /// If you want to be sure they don't, use [`that_in_background()`] instead.
 pub fn that<T: AsRef<OsStr>>(path: T) -> io::Result<()> {
-    os::that(path)
+    let mut last_err = None;
+    for mut cmd in commands(path) {
+        match cmd.status_without_output() {
+            Ok(status) => {
+                return Ok(status).into_result(&cmd);
+            }
+            Err(err) => last_err = Some(err),
+        }
+    }
+    Err(last_err.expect("no launcher worked, at least one error"))
 }
 
 /// Open path with the given application.

src/macos.rs

@@ -8,11 +8,6 @@ pub fn commands<T: AsRef<OsStr>>(path: T) -> Vec<Command> {
     vec![cmd]
 }
 
-pub fn that<T: AsRef<OsStr>>(path: T) -> io::Result<()> {
-    let cmd = &mut commands(path)[0];
-    cmd.status_without_output().into_result(cmd)
-}
-
 pub fn with<T: AsRef<OsStr>>(path: T, app: impl Into<String>) -> io::Result<()> {
     let mut cmd = Command::new("/usr/bin/open");
     cmd.arg(path.as_ref())

src/unix.rs

@@ -26,19 +26,6 @@ pub fn commands<T: AsRef<OsStr>>(path: T) -> Vec<Command> {
     .collect()
 }
 
-pub fn that<T: AsRef<OsStr>>(path: T) -> io::Result<()> {
-    let mut last_err = None;
-    for mut cmd in commands(path) {
-        match cmd.status_without_output() {
-            Ok(status) => {
-                return Ok(status).into_result(&cmd);
-            }
-            Err(err) => last_err = Some(err),
-        }
-    }
-    Err(last_err.expect("no launcher worked, at least one error"))
-}
-
 pub fn with<T: AsRef<OsStr>>(path: T, app: impl Into<String>) -> io::Result<()> {
     let mut cmd = Command::new(app.into());
     cmd.arg(path.as_ref())

src/windows.rs

@@ -8,11 +8,6 @@ pub fn commands<T: AsRef<OsStr>>(path: T) -> Vec<Command> {
     vec![cmd]
 }
 
-pub fn that<T: AsRef<OsStr>>(path: T) -> io::Result<()> {
-    let cmd = &mut commands(path)[0];
-    cmd.status_without_output().into_result(cmd)
-}
-
 pub fn with<T: AsRef<OsStr>>(path: T, app: impl Into<String>) -> io::Result<()> {
     let mut cmd = Command::new("cmd");
     cmd.arg("/c")