sharkdp/hyperfine
1
1
Fork 0
mirror of https://github.com/sharkdp/hyperfine.git synced 2024-09-11 14:07:02 +03:00
Code Issues Projects Releases Wiki Activity

Move Stdio extraction to enum

Browse Source
This commit is contained in:
David Peter 2022-02-22 11:54:00 +01:00
parent 8955006508
commit 11921b9391
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/benchmark/executor.rs
View File

@ -1,7 +1,7 @@
use std::process::{ExitStatus, Stdio};
use crate::command::Command;
use crate::options::{CmdFailureAction, CommandOutputPolicy, Options, OutputStyleOption, Shell};
use crate::options::{CmdFailureAction, Options, OutputStyleOption, Shell};
use crate::output::progress_bar::get_progress_bar;
use crate::timer::{execute_and_measure, wall_clock_timer::WallClockTimer};
use crate::util::randomized_environment_offset;
@ -63,10 +63,7 @@ impl<'a> Executor for ShellExecutor<'a> {
command: &Command<'_>,
command_failure_action: Option<CmdFailureAction>,
) -> Result<(TimingResult, ExitStatus)> {
let (stdout, stderr) = match self.options.command_output_policy {
CommandOutputPolicy::Discard => (Stdio::null(), Stdio::null()),
CommandOutputPolicy::Forward => (Stdio::inherit(), Stdio::inherit()),
};
let (stdout, stderr) = self.options.command_output_policy.get_stdout_stderr();
let mut command_builder = self.shell.command();
command_builder

11
src/options.rs
View File

@ -1,4 +1,4 @@
use std::process::Command;
use std::process::{Command, Stdio};
use std::{cmp, fmt};
use anyhow::ensure;
@ -124,6 +124,15 @@ impl Default for CommandOutputPolicy {
}
}
impl CommandOutputPolicy {
pub fn get_stdout_stderr(&self) -> (Stdio, Stdio) {
match self {
CommandOutputPolicy::Discard => (Stdio::null(), Stdio::null()),
CommandOutputPolicy::Forward => (Stdio::inherit(), Stdio::inherit()),
}
}
}
pub enum ExecutorKind {
Shell(Shell),
Mock(Option<String>),