Use OsStr instead of OsString

tokcum · May 17, 2020 · 5a41126 · 5a41126
1 parent 0d5c4de
commit 5a41126
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 15 deletions.
diff --git a/cargo-crev/src/shared.rs b/cargo-crev/src/shared.rs
@@ -269,7 +269,7 @@ pub fn crate_open(crate_sel: &CrateSelector, cmd: Option<String>, cmd_save: bool
         &crate_.version(),
         &crev_lib::ReviewActivity::new_full(),
     )?;
-    let status = crev_lib::util::run_with_shell_cmd(open_cmd.into(), Some(crate_root))?;
+    let status = crev_lib::util::run_with_shell_cmd(open_cmd.as_ref(), Some(crate_root))?;
 
     if !status.success() {
         bail!("Shell returned {}", status);

diff --git a/crev-common/src/lib.rs b/crev-common/src/lib.rs
@@ -5,12 +5,12 @@ pub mod convert;
 pub mod fs;
 pub mod rand;
 pub mod serde;
+use std::ffi::OsStr;
 pub use crate::blake2b256::Blake2b256;
 use blake2::{digest::FixedOutput, Digest};
 use std::{
     collections::HashSet,
     env,
-    ffi::OsString,
     io::{self, BufRead, Read, Write},
     path::{Path, PathBuf},
     process,
@@ -209,13 +209,13 @@ pub fn yes_or_no_was_y(msg: &str) -> io::Result<bool> {
 }
 
 pub fn run_with_shell_cmd(
-    cmd: OsString,
+    cmd: &OsStr,
     arg: Option<&Path>,
 ) -> io::Result<std::process::ExitStatus> {
     Ok(run_with_shell_cmd_custom(cmd, arg, false)?.status)
 }
 
-pub fn run_with_shell_cmd_capture_stdout(cmd: OsString, arg: Option<&Path>) -> io::Result<Vec<u8>> {
+pub fn run_with_shell_cmd_capture_stdout(cmd: &OsStr, arg: Option<&Path>) -> io::Result<Vec<u8>> {
     let output = run_with_shell_cmd_custom(cmd, arg, true)?;
     if !output.status.success() {
         return Err(std::io::Error::new(
@@ -227,7 +227,7 @@ pub fn run_with_shell_cmd_capture_stdout(cmd: OsString, arg: Option<&Path>) -> i
 }
 
 pub fn run_with_shell_cmd_custom(
-    cmd: OsString,
+    cmd: &OsStr,
     arg: Option<&Path>,
     capture_stdout: bool,
 ) -> io::Result<std::process::Output> {
@@ -250,20 +250,14 @@ pub fn run_with_shell_cmd_custom(
         if let Some(arg) = arg {
             proc.arg("-c").arg(format!(
                 "{} {}",
-                cmd.clone().into_string().map_err(|_| std::io::Error::new(
+                cmd.to_str().ok_or_else(|| std::io::Error::new(
                     io::ErrorKind::InvalidData,
                     "not a valid unicode"
                 ))?,
                 shell_escape::escape(arg.display().to_string().into())
             ));
         } else {
-            proc.arg("-c").arg(format!(
-                "{}",
-                cmd.clone().into_string().map_err(|_| std::io::Error::new(
-                    io::ErrorKind::InvalidData,
-                    "not a valid unicode"
-                ))?,
-            ));
+            proc.arg("-c").arg(cmd);
         }
         proc
     } else {
@@ -285,7 +279,7 @@ pub fn read_passphrase() -> io::Result<String> {
         return Ok(pass);
     } else if let Some(cmd) = env::var_os("CREV_PASSPHRASE_CMD") {
         return Ok(
-            String::from_utf8_lossy(&run_with_shell_cmd_capture_stdout(cmd, None)?)
+            String::from_utf8_lossy(&run_with_shell_cmd_capture_stdout(&cmd, None)?)
                 .trim()
                 .to_owned(),
         );

diff --git a/crev-lib/src/util/mod.rs b/crev-lib/src/util/mod.rs
@@ -74,7 +74,7 @@ pub fn edit_text_iteractively_until_writen_to(text: &str) -> Result<String> {
 pub fn edit_file(path: &Path) -> Result<()> {
     let editor = get_editor_to_use()?;
 
-    let status = run_with_shell_cmd(editor, Some(path))?;
+    let status = run_with_shell_cmd(&editor, Some(path))?;
 
     if !status.success() {
         Error::EditorLaunch(status.code().unwrap_or(-1));