windows: Fix semantic merge conflict with ShellKind::new (#40107)
Release Notes: - N/A
This commit is contained in:
@@ -166,7 +166,7 @@ mod test {
|
||||
#[test]
|
||||
fn redirect_stdin_to_dev_null_fish() {
|
||||
let shell = Shell::Program("fish".to_owned());
|
||||
let shell_builder = ShellBuilder::new(&shell);
|
||||
let shell_builder = ShellBuilder::new(&shell, false);
|
||||
|
||||
let (program, args) = shell_builder
|
||||
.redirect_stdin_to_dev_null()
|
||||
|
||||
@@ -355,10 +355,10 @@ impl Shell {
|
||||
}
|
||||
}
|
||||
|
||||
pub fn shell_kind(&self) -> ShellKind {
|
||||
pub fn shell_kind(&self, is_windows: bool) -> ShellKind {
|
||||
match self {
|
||||
Shell::Program(program) => ShellKind::new(program),
|
||||
Shell::WithArguments { program, .. } => ShellKind::new(program),
|
||||
Shell::Program(program) => ShellKind::new(program, is_windows),
|
||||
Shell::WithArguments { program, .. } => ShellKind::new(program, is_windows),
|
||||
Shell::System => ShellKind::system(),
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user