RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-30 20:47:46 +00:00
Code Issues Activity

tests/common: UCommand::new rename arg to bin_path

Browse source 
Merge and remove unecessary `.as_ref()`
This commit is contained in:
Thomas Queiroz 2021-11-09 00:09:18 -03:00
parent 2e12316ae1
commit fc300dda24
No known key found for this signature in database
GPG key ID: 229D2DDF7ECA5F8F
1 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

19
tests/common/util.rs
View file

@ -838,12 +838,17 @@ pub struct UCommand {
} }
impl UCommand { impl UCommand {
pub fn new<T: AsRef<OsStr>, U: AsRef<OsStr>>(arg: T, curdir: U, env_clear: bool) -> UCommand { pub fn new<T: AsRef<OsStr>, U: AsRef<OsStr>>(
bin_path: T,
curdir: U,
env_clear: bool,
) -> UCommand {
let bin_path = bin_path.as_ref();
UCommand { UCommand {
tmpd: None, tmpd: None,
has_run: false, has_run: false,
raw: { raw: {
let mut cmd = Command::new(arg.as_ref()); let mut cmd = Command::new(bin_path);
cmd.current_dir(curdir.as_ref()); cmd.current_dir(curdir.as_ref());
if env_clear { if env_clear {
if cfg!(windows) { if cfg!(windows) {
@ -863,7 +868,7 @@ impl UCommand {
} }
cmd cmd
}, },
comm_string: String::from(arg.as_ref().to_str().unwrap()), comm_string: String::from(bin_path.to_str().unwrap()),
ignore_stdin_write_error: false, ignore_stdin_write_error: false,
bytes_into_stdin: None, bytes_into_stdin: None,
stdin: None, stdin: None,
@ -874,9 +879,13 @@ impl UCommand {
} }
} }
pub fn new_from_tmp<T: AsRef<OsStr>>(arg: T, tmpd: Rc<TempDir>, env_clear: bool) -> UCommand { pub fn new_from_tmp<T: AsRef<OsStr>>(
bin_path: T,
tmpd: Rc<TempDir>,
env_clear: bool,
) -> UCommand {
let tmpd_path_buf = String::from(&(*tmpd.as_ref().path().to_str().unwrap())); let tmpd_path_buf = String::from(&(*tmpd.as_ref().path().to_str().unwrap()));
let mut ucmd: UCommand = UCommand::new(arg.as_ref(), tmpd_path_buf, env_clear); let mut ucmd: UCommand = UCommand::new(bin_path, tmpd_path_buf, env_clear);
ucmd.tmpd = Some(tmpd); ucmd.tmpd = Some(tmpd);
ucmd ucmd
} }