aboutsummaryrefslogtreecommitdiff
path: root/src/makefile/command_line.rs
diff options
context:
space:
mode:
Diffstat (limited to 'src/makefile/command_line.rs')
-rw-r--r--src/makefile/command_line.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/makefile/command_line.rs b/src/makefile/command_line.rs
index 6b42105..20b0d25 100644
--- a/src/makefile/command_line.rs
+++ b/src/makefile/command_line.rs
@@ -10,11 +10,11 @@ use crate::makefile::Makefile;
// inspired by python's subprocess module
fn execute_command_line(command_line: &str, ignore_errors: bool) -> Result<ExitStatus, io::Error> {
let (program, args) = if cfg!(windows) {
- let cmd = env::var("COMSPEC").unwrap_or("cmd.exe".into());
+ let cmd = env::var("COMSPEC").unwrap_or_else(|_| "cmd.exe".into());
let args = vec!["/c", command_line];
(cmd, args)
} else {
- let sh = env::var("SHELL").unwrap_or("/bin/sh".into());
+ let sh = env::var("SHELL").unwrap_or_else(|_| "/bin/sh".into());
let args = if ignore_errors {
vec!["-c", command_line]
} else {
@@ -61,7 +61,7 @@ impl CommandLine {
*text = text_chars.collect();
}
- CommandLine {
+ Self {
ignore_errors,
silent,
always_execute,