From dc8e27a4af2fe58a5fba605c393039f5d58ec88a Mon Sep 17 00:00:00 2001
From: Steve Nease <stephen.h.nease@gmail.com>
Date: Sun, 11 Sep 2022 16:20:22 -0500
Subject: [PATCH 01/10] Added --stdin-data argument

This argument accepts a path to a file. The data contained in the file will be passed to the command via stdin.

Closes sharkdp/hyperfine#541
---
 src/benchmark/executor.rs  |  8 +++++--
 src/cli.rs                 |  8 +++++++
 src/error.rs               |  2 ++
 src/options.rs             | 47 +++++++++++++++++++++++++++++++++++++-
 tests/example_stdin_data   |  1 +
 tests/integration_tests.rs | 28 +++++++++++++++++++++++
 6 files changed, 91 insertions(+), 3 deletions(-)
 create mode 100644 tests/example_stdin_data

diff --git a/src/benchmark/executor.rs b/src/benchmark/executor.rs
index a8f84a9c6..5bd754a52 100644
--- a/src/benchmark/executor.rs
+++ b/src/benchmark/executor.rs
@@ -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, CommandInputPolicy, CommandOutputPolicy, Options, OutputStyleOption, Shell};
 use crate::output::progress_bar::get_progress_bar;
 use crate::timer::{execute_and_measure, TimerResult};
 use crate::util::randomized_environment_offset;
@@ -36,11 +36,13 @@ pub trait Executor {
 fn run_command_and_measure_common(
     mut command: std::process::Command,
     command_failure_action: CmdFailureAction,
+    command_input_policy: &CommandInputPolicy,
     command_output_policy: &CommandOutputPolicy,
     command_name: &str,
 ) -> Result<TimerResult> {
     let (stdout, stderr) = command_output_policy.get_stdout_stderr()?;
-    command.stdin(Stdio::null()).stdout(stdout).stderr(stderr);
+    let stdin = command_input_policy.get_stdin()?;
+    command.stdin(stdin).stdout(stdout).stderr(stderr);
 
     command.env(
         "HYPERFINE_RANDOMIZED_ENVIRONMENT_OFFSET",
@@ -83,6 +85,7 @@ impl<'a> Executor for RawExecutor<'a> {
         let result = run_command_and_measure_common(
             command.get_command()?,
             command_failure_action.unwrap_or(self.options.command_failure_action),
+            &self.options.command_input_policy,
             &self.options.command_output_policy,
             &command.get_command_line(),
         )?;
@@ -136,6 +139,7 @@ impl<'a> Executor for ShellExecutor<'a> {
         let mut result = run_command_and_measure_common(
             command_builder,
             command_failure_action.unwrap_or(self.options.command_failure_action),
+            &self.options.command_input_policy,
             &self.options.command_output_policy,
             &command.get_command_line(),
         )?;
diff --git a/src/cli.rs b/src/cli.rs
index 75f8e238b..88fd2b7eb 100644
--- a/src/cli.rs
+++ b/src/cli.rs
@@ -311,6 +311,14 @@ fn build_command() -> Command<'static> {
             .hide(true)
             .help("Enable debug mode which does not actually run commands, but returns fake times when the command is 'sleep <time>'.")
         )
+        .arg(
+            Arg::new("stdin-data")
+                .long("stdin-data")
+                .takes_value(true)
+                .number_of_values(1)
+                .value_name("FILE")
+                .help("Path to file containing stdin data to provide to the command"),
+        )
 }
 
 #[test]
diff --git a/src/error.rs b/src/error.rs
index a38bbd364..2e6d27905 100644
--- a/src/error.rs
+++ b/src/error.rs
@@ -53,4 +53,6 @@ pub enum OptionsError<'a> {
     ShellParseError(shell_words::ParseError),
     #[error("Unknown output policy '{0}'. Use './{0}' to output to a file named '{0}'.")]
     UnknownOutputPolicy(String),
+    #[error("File containing stdin data '{0}' does not exist")]
+    StdinDataFileDoesNotExist(String),
 }
diff --git a/src/options.rs b/src/options.rs
index 1ef3e01e4..105b47651 100644
--- a/src/options.rs
+++ b/src/options.rs
@@ -110,6 +110,36 @@ impl Default for RunBounds {
     }
 }
 
+#[derive(Debug, Clone, PartialEq)]
+pub enum CommandInputPolicy {
+    /// Redirect from the null device
+    Null,
+
+    /// Redirect input from a file
+    File(PathBuf),
+}
+
+impl Default for CommandInputPolicy {
+    fn default() -> Self {
+        CommandInputPolicy::Null
+    }
+}
+
+impl CommandInputPolicy {
+    pub fn get_stdin(&self) -> io::Result<Stdio> {
+        let stream: Stdio = match self {
+            CommandInputPolicy::Null => Stdio::null(),
+
+            CommandInputPolicy::File(path) => {
+                let file: File = File::open(&path)?;
+                Stdio::from(file)
+            }
+        };
+
+        Ok(stream)
+    }
+}
+
 /// How to handle the output of benchmarked commands
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub enum CommandOutputPolicy {
@@ -196,8 +226,12 @@ pub struct Options {
     /// What to do with the output of the benchmarked command
     pub command_output_policy: CommandOutputPolicy,
 
-    /// Which time unit to use when displaying resuls
+    /// Which time unit to use when displaying results
     pub time_unit: Option<Unit>,
+
+    /// Where input to the benchmarked command comes from
+    pub command_input_policy: CommandInputPolicy,
+
 }
 
 impl Default for Options {
@@ -214,6 +248,7 @@ impl Default for Options {
             executor_kind: ExecutorKind::default(),
             command_output_policy: CommandOutputPolicy::Null,
             time_unit: None,
+            command_input_policy: CommandInputPolicy::Null,
         }
     }
 }
@@ -351,6 +386,16 @@ impl Options {
                 .map_err(|e| OptionsError::FloatParsingError("min-benchmarking-time", e))?;
         }
 
+        options.command_input_policy = if let Some(path_str) = matches.value_of("stdin-data") {
+            let path = PathBuf::from(path_str);
+            if !path.exists() {
+                return Err(OptionsError::StdinDataFileDoesNotExist(path_str.to_string()))
+            }
+            CommandInputPolicy::File(path)
+        } else {
+            CommandInputPolicy::Null
+        };
+
         Ok(options)
     }
 
diff --git a/tests/example_stdin_data b/tests/example_stdin_data
new file mode 100644
index 000000000..2483820ed
--- /dev/null
+++ b/tests/example_stdin_data
@@ -0,0 +1 @@
+This data is passed to the command via stdin
diff --git a/tests/integration_tests.rs b/tests/integration_tests.rs
index 8a215c951..073740c40 100644
--- a/tests/integration_tests.rs
+++ b/tests/integration_tests.rs
@@ -215,6 +215,34 @@ fn runs_commands_using_user_defined_shell() {
         );
 }
 
+#[test]
+fn can_pass_file_data_to_command_via_stdin(){
+    hyperfine()
+        .arg("--runs=1")
+        .arg("--stdin-data=example_stdin_data")
+        .arg("--show-output")
+        .arg("cat")
+        .assert()
+        .success()
+        .stdout(
+            predicate::str::contains("This data is passed to the command via stdin")
+        );
+}
+
+#[test]
+fn fails_if_invalid_stdin_data_file_provided(){
+    hyperfine()
+        .arg("--runs=1")
+        .arg("--stdin-data=example_stdin_data_invalid")
+        .arg("--show-output")
+        .arg("cat")
+        .assert()
+        .failure()
+        .stderr(
+            predicate::str::contains("File containing stdin data 'example_stdin_data_invalid' does not exist")
+        );
+}
+
 #[test]
 fn returns_mean_time_in_correct_unit() {
     hyperfine_debug()

From 54a7a898b9f9a7eeebf474eab5a02f40b7c72dc3 Mon Sep 17 00:00:00 2001
From: Steve Nease <stephen.h.nease@gmail.com>
Date: Sun, 11 Sep 2022 17:11:05 -0500
Subject: [PATCH 02/10] ran cargo fmt

---
 src/benchmark/executor.rs  |  4 +++-
 src/options.rs             |  5 +++--
 tests/integration_tests.rs | 16 ++++++++--------
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/benchmark/executor.rs b/src/benchmark/executor.rs
index 5bd754a52..4561419d5 100644
--- a/src/benchmark/executor.rs
+++ b/src/benchmark/executor.rs
@@ -1,7 +1,9 @@
 use std::process::{ExitStatus, Stdio};
 
 use crate::command::Command;
-use crate::options::{CmdFailureAction, CommandInputPolicy, CommandOutputPolicy, Options, OutputStyleOption, Shell};
+use crate::options::{
+    CmdFailureAction, CommandInputPolicy, CommandOutputPolicy, Options, OutputStyleOption, Shell,
+};
 use crate::output::progress_bar::get_progress_bar;
 use crate::timer::{execute_and_measure, TimerResult};
 use crate::util::randomized_environment_offset;
diff --git a/src/options.rs b/src/options.rs
index 105b47651..87a49572a 100644
--- a/src/options.rs
+++ b/src/options.rs
@@ -231,7 +231,6 @@ pub struct Options {
 
     /// Where input to the benchmarked command comes from
     pub command_input_policy: CommandInputPolicy,
-
 }
 
 impl Default for Options {
@@ -389,7 +388,9 @@ impl Options {
         options.command_input_policy = if let Some(path_str) = matches.value_of("stdin-data") {
             let path = PathBuf::from(path_str);
             if !path.exists() {
-                return Err(OptionsError::StdinDataFileDoesNotExist(path_str.to_string()))
+                return Err(OptionsError::StdinDataFileDoesNotExist(
+                    path_str.to_string(),
+                ));
             }
             CommandInputPolicy::File(path)
         } else {
diff --git a/tests/integration_tests.rs b/tests/integration_tests.rs
index 073740c40..810bdf0ff 100644
--- a/tests/integration_tests.rs
+++ b/tests/integration_tests.rs
@@ -216,7 +216,7 @@ fn runs_commands_using_user_defined_shell() {
 }
 
 #[test]
-fn can_pass_file_data_to_command_via_stdin(){
+fn can_pass_file_data_to_command_via_stdin() {
     hyperfine()
         .arg("--runs=1")
         .arg("--stdin-data=example_stdin_data")
@@ -224,13 +224,13 @@ fn can_pass_file_data_to_command_via_stdin(){
         .arg("cat")
         .assert()
         .success()
-        .stdout(
-            predicate::str::contains("This data is passed to the command via stdin")
-        );
+        .stdout(predicate::str::contains(
+            "This data is passed to the command via stdin",
+        ));
 }
 
 #[test]
-fn fails_if_invalid_stdin_data_file_provided(){
+fn fails_if_invalid_stdin_data_file_provided() {
     hyperfine()
         .arg("--runs=1")
         .arg("--stdin-data=example_stdin_data_invalid")
@@ -238,9 +238,9 @@ fn fails_if_invalid_stdin_data_file_provided(){
         .arg("cat")
         .assert()
         .failure()
-        .stderr(
-            predicate::str::contains("File containing stdin data 'example_stdin_data_invalid' does not exist")
-        );
+        .stderr(predicate::str::contains(
+            "File containing stdin data 'example_stdin_data_invalid' does not exist",
+        ));
 }
 
 #[test]

From fed0f030783ac2be52f15790479cf982ed1102d4 Mon Sep 17 00:00:00 2001
From: snease <stephen.h.nease@gmail.com>
Date: Sat, 15 Oct 2022 14:29:54 -0500
Subject: [PATCH 03/10] Apply suggestions from code review

Co-authored-by: David Peter <sharkdp@users.noreply.github.com>
---
 src/options.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/options.rs b/src/options.rs
index 87a49572a..1851db827 100644
--- a/src/options.rs
+++ b/src/options.rs
@@ -112,10 +112,10 @@ impl Default for RunBounds {
 
 #[derive(Debug, Clone, PartialEq)]
 pub enum CommandInputPolicy {
-    /// Redirect from the null device
+    /// Read from the null device
     Null,
 
-    /// Redirect input from a file
+    /// Read input from a file
     File(PathBuf),
 }
 

From c6da874ffe2ec513c15fd28bebfdfd76e35763e2 Mon Sep 17 00:00:00 2001
From: Steve Nease <stephen.h.nease@gmail.com>
Date: Sat, 15 Oct 2022 14:36:40 -0500
Subject: [PATCH 04/10] Add the rest of the suggestions from code review

---
 src/benchmark/executor.rs  |  2 +-
 src/cli.rs                 | 10 ++++++----
 src/options.rs             |  8 ++++----
 tests/integration_tests.rs |  4 ++--
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/benchmark/executor.rs b/src/benchmark/executor.rs
index 4561419d5..3190e45a1 100644
--- a/src/benchmark/executor.rs
+++ b/src/benchmark/executor.rs
@@ -1,4 +1,4 @@
-use std::process::{ExitStatus, Stdio};
+use std::process::ExitStatus;
 
 use crate::command::Command;
 use crate::options::{
diff --git a/src/cli.rs b/src/cli.rs
index 88fd2b7eb..4c4dfee04 100644
--- a/src/cli.rs
+++ b/src/cli.rs
@@ -312,12 +312,14 @@ fn build_command() -> Command<'static> {
             .help("Enable debug mode which does not actually run commands, but returns fake times when the command is 'sleep <time>'.")
         )
         .arg(
-            Arg::new("stdin-data")
-                .long("stdin-data")
+            Arg::new("input")
+                .long("input")
                 .takes_value(true)
                 .number_of_values(1)
-                .value_name("FILE")
-                .help("Path to file containing stdin data to provide to the command"),
+                .value_name("FROM")
+                .help("Control where the input of the benchmark comes from. <FROM> can be: \
+                       null: Read from /edv/null (the default).
+                       <FILE>: Read the input from the given file"),
         )
 }
 
diff --git a/src/options.rs b/src/options.rs
index 1851db827..694e68f59 100644
--- a/src/options.rs
+++ b/src/options.rs
@@ -223,14 +223,14 @@ pub struct Options {
     /// Determines how we run commands
     pub executor_kind: ExecutorKind,
 
+    /// Where input to the benchmarked command comes from
+    pub command_input_policy: CommandInputPolicy,
+
     /// What to do with the output of the benchmarked command
     pub command_output_policy: CommandOutputPolicy,
 
     /// Which time unit to use when displaying results
     pub time_unit: Option<Unit>,
-
-    /// Where input to the benchmarked command comes from
-    pub command_input_policy: CommandInputPolicy,
 }
 
 impl Default for Options {
@@ -385,7 +385,7 @@ impl Options {
                 .map_err(|e| OptionsError::FloatParsingError("min-benchmarking-time", e))?;
         }
 
-        options.command_input_policy = if let Some(path_str) = matches.value_of("stdin-data") {
+        options.command_input_policy = if let Some(path_str) = matches.value_of("input") {
             let path = PathBuf::from(path_str);
             if !path.exists() {
                 return Err(OptionsError::StdinDataFileDoesNotExist(
diff --git a/tests/integration_tests.rs b/tests/integration_tests.rs
index 810bdf0ff..ab8d028be 100644
--- a/tests/integration_tests.rs
+++ b/tests/integration_tests.rs
@@ -219,7 +219,7 @@ fn runs_commands_using_user_defined_shell() {
 fn can_pass_file_data_to_command_via_stdin() {
     hyperfine()
         .arg("--runs=1")
-        .arg("--stdin-data=example_stdin_data")
+        .arg("--input=example_stdin_data")
         .arg("--show-output")
         .arg("cat")
         .assert()
@@ -233,7 +233,7 @@ fn can_pass_file_data_to_command_via_stdin() {
 fn fails_if_invalid_stdin_data_file_provided() {
     hyperfine()
         .arg("--runs=1")
-        .arg("--stdin-data=example_stdin_data_invalid")
+        .arg("--input=example_stdin_data_invalid")
         .arg("--show-output")
         .arg("cat")
         .assert()

From 028a2036e07179fa2355eac0dfbf2af346e755ac Mon Sep 17 00:00:00 2001
From: David Peter <sharkdp@users.noreply.github.com>
Date: Wed, 15 Mar 2023 08:58:52 +0100
Subject: [PATCH 05/10] Rename test file

---
 tests/example_input_file.txt | 1 +
 tests/example_stdin_data     | 1 -
 tests/integration_tests.rs   | 8 +++-----
 3 files changed, 4 insertions(+), 6 deletions(-)
 create mode 100644 tests/example_input_file.txt
 delete mode 100644 tests/example_stdin_data

diff --git a/tests/example_input_file.txt b/tests/example_input_file.txt
new file mode 100644
index 000000000..0d924b8b9
--- /dev/null
+++ b/tests/example_input_file.txt
@@ -0,0 +1 @@
+This text is part of a file
diff --git a/tests/example_stdin_data b/tests/example_stdin_data
deleted file mode 100644
index 2483820ed..000000000
--- a/tests/example_stdin_data
+++ /dev/null
@@ -1 +0,0 @@
-This data is passed to the command via stdin
diff --git a/tests/integration_tests.rs b/tests/integration_tests.rs
index ab8d028be..0e8113f16 100644
--- a/tests/integration_tests.rs
+++ b/tests/integration_tests.rs
@@ -216,17 +216,15 @@ fn runs_commands_using_user_defined_shell() {
 }
 
 #[test]
-fn can_pass_file_data_to_command_via_stdin() {
+fn can_pass_input_to_command_from_a_file() {
     hyperfine()
         .arg("--runs=1")
-        .arg("--input=example_stdin_data")
+        .arg("--input=example_input_file.txt")
         .arg("--show-output")
         .arg("cat")
         .assert()
         .success()
-        .stdout(predicate::str::contains(
-            "This data is passed to the command via stdin",
-        ));
+        .stdout(predicate::str::contains("This text is part of a file"));
 }
 
 #[test]

From 48eec68af22dc8eb319e0f52c208e81319a1fac3 Mon Sep 17 00:00:00 2001
From: David Peter <mail@david-peter.de>
Date: Wed, 15 Mar 2023 09:08:59 +0100
Subject: [PATCH 06/10] Formatting of help text

---
 src/cli.rs | 46 ++++++++++++++++++++++++++++------------------
 1 file changed, 28 insertions(+), 18 deletions(-)

diff --git a/src/cli.rs b/src/cli.rs
index 4c4dfee04..6a358ce5e 100644
--- a/src/cli.rs
+++ b/src/cli.rs
@@ -273,16 +273,36 @@ fn build_command() -> Command<'static> {
                 .takes_value(true)
                 .value_name("WHERE")
                 .help(
-                    "Control where the output of the benchmark is redirected. <WHERE> can be:\n\n\
-                     null: Redirect output to /dev/null (the default). \
-                     Note that some programs like 'grep' detect when standard output is /dev/null \
-                     and apply certain optimizations. To avoid that, consider using \
-                     '--output=pipe'.\n\n\
-                     pipe: Feed the output through a pipe before discarding it.\n\n\
-                     inherit: Don't redirect the output at all (same as '--show-output').\n\n\
-                     <FILE>: Write the output to the given file.",
+                    "Control where the output of the benchmark is redirected. Note \
+                     that some programs like 'grep' detect when standard output is \
+                     /dev/null and apply certain optimizations. To avoid that, consider \
+                     using '--output=pipe'.\n\
+                     \n\
+                     <WHERE> can be:\n\
+                     \n  \
+                       null:     Redirect output to /dev/null (the default).\n\
+                     \n  \
+                       pipe:     Feed the output through a pipe before discarding it.\n\
+                     \n  \
+                       inherit:  Don't redirect the output at all (same as '--show-output').\n\
+                     \n  \
+                       <FILE>:   Write the output to the given file.",
                 ),
         )
+        .arg(
+            Arg::new("input")
+                .long("input")
+                .takes_value(true)
+                .number_of_values(1)
+                .value_name("WHERE")
+                .help("Control where the input of the benchmark comes from.\n\
+                       \n\
+                       <WHERE> can be:\n\
+                       \n  \
+                         null:     Read from /dev/null (the default).\n\
+                       \n  \
+                         <FILE>:   Read the input from the given file."),
+        )
         .arg(
             Arg::new("command-name")
                 .long("command-name")
@@ -311,16 +331,6 @@ fn build_command() -> Command<'static> {
             .hide(true)
             .help("Enable debug mode which does not actually run commands, but returns fake times when the command is 'sleep <time>'.")
         )
-        .arg(
-            Arg::new("input")
-                .long("input")
-                .takes_value(true)
-                .number_of_values(1)
-                .value_name("FROM")
-                .help("Control where the input of the benchmark comes from. <FROM> can be: \
-                       null: Read from /edv/null (the default).
-                       <FILE>: Read the input from the given file"),
-        )
 }
 
 #[test]

From a34d2896f8e706f28d081286f6a652b65a79a44e Mon Sep 17 00:00:00 2001
From: David Peter <mail@david-peter.de>
Date: Wed, 15 Mar 2023 09:09:44 +0100
Subject: [PATCH 07/10] Change order of input/outut

---
 src/benchmark/executor.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/benchmark/executor.rs b/src/benchmark/executor.rs
index 3190e45a1..141ddd58b 100644
--- a/src/benchmark/executor.rs
+++ b/src/benchmark/executor.rs
@@ -42,8 +42,8 @@ fn run_command_and_measure_common(
     command_output_policy: &CommandOutputPolicy,
     command_name: &str,
 ) -> Result<TimerResult> {
-    let (stdout, stderr) = command_output_policy.get_stdout_stderr()?;
     let stdin = command_input_policy.get_stdin()?;
+    let (stdout, stderr) = command_output_policy.get_stdout_stderr()?;
     command.stdin(stdin).stdout(stdout).stderr(stderr);
 
     command.env(

From c19c5adba2c1aa912faad129f2b695fafe254b3f Mon Sep 17 00:00:00 2001
From: David Peter <mail@david-peter.de>
Date: Wed, 15 Mar 2023 09:12:14 +0100
Subject: [PATCH 08/10] Change error message

---
 src/error.rs               | 2 +-
 tests/integration_tests.rs | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/error.rs b/src/error.rs
index 2e6d27905..53d39a57d 100644
--- a/src/error.rs
+++ b/src/error.rs
@@ -53,6 +53,6 @@ pub enum OptionsError<'a> {
     ShellParseError(shell_words::ParseError),
     #[error("Unknown output policy '{0}'. Use './{0}' to output to a file named '{0}'.")]
     UnknownOutputPolicy(String),
-    #[error("File containing stdin data '{0}' does not exist")]
+    #[error("The file '{0}' specified as '--input' does not exist")]
     StdinDataFileDoesNotExist(String),
 }
diff --git a/tests/integration_tests.rs b/tests/integration_tests.rs
index 0e8113f16..eb5765607 100644
--- a/tests/integration_tests.rs
+++ b/tests/integration_tests.rs
@@ -231,13 +231,13 @@ fn can_pass_input_to_command_from_a_file() {
 fn fails_if_invalid_stdin_data_file_provided() {
     hyperfine()
         .arg("--runs=1")
-        .arg("--input=example_stdin_data_invalid")
+        .arg("--input=example_non_existent_file.txt")
         .arg("--show-output")
         .arg("cat")
         .assert()
         .failure()
         .stderr(predicate::str::contains(
-            "File containing stdin data 'example_stdin_data_invalid' does not exist",
+            "The file 'example_non_existent_file.txt' specified as '--input' does not exist",
         ));
 }
 

From e375b7447e0faed03c3c5696c5087fc4e9f5e133 Mon Sep 17 00:00:00 2001
From: David Peter <mail@david-peter.de>
Date: Wed, 15 Mar 2023 09:13:13 +0100
Subject: [PATCH 09/10] Add CHANGELOG entry

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 264981d5d..3c2a19666 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## Features
 
+- Added new `--input` option, see #541 and #563 (@snease)
 
 ## Changes
 

From 093ae88ffc9abc844123d34b75e1c949dcf6ce70 Mon Sep 17 00:00:00 2001
From: David Peter <mail@david-peter.de>
Date: Wed, 15 Mar 2023 09:23:20 +0100
Subject: [PATCH 10/10] Fix merge conflicts

---
 src/cli.rs     | 2 +-
 src/options.rs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/cli.rs b/src/cli.rs
index 4435678c7..7e733755d 100644
--- a/src/cli.rs
+++ b/src/cli.rs
@@ -293,7 +293,7 @@ fn build_command() -> Command {
         .arg(
             Arg::new("input")
                 .long("input")
-                .takes_value(true)
+                .action(ArgAction::Set)
                 .number_of_values(1)
                 .value_name("WHERE")
                 .help("Control where the input of the benchmark comes from.\n\
diff --git a/src/options.rs b/src/options.rs
index be226bd17..8a8caf4bb 100644
--- a/src/options.rs
+++ b/src/options.rs
@@ -388,7 +388,7 @@ impl Options {
                 .map_err(|e| OptionsError::FloatParsingError("min-benchmarking-time", e))?;
         }
 
-        options.command_input_policy = if let Some(path_str) = matches.value_of("input") {
+        options.command_input_policy = if let Some(path_str) = matches.get_one::<String>("input") {
             let path = PathBuf::from(path_str);
             if !path.exists() {
                 return Err(OptionsError::StdinDataFileDoesNotExist(