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

Rename to get_command_line

Browse Source
This commit is contained in:
David Peter 2022-02-22 10:55:58 +01:00
parent defafdf707
commit 45c07323e1
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/benchmark/executor.rs
View File

@ -61,7 +61,7 @@ impl<'a> Executor for ShellExecutor<'a> {
};
let wallclock_timer = WallClockTimer::start();
let result = execute_and_time(stdout, stderr, &command.get_shell_command(), self.shell)?;
let result = execute_and_time(stdout, stderr, &command.get_command_line(), self.shell)?;
let mut time_real = wallclock_timer.stop();
let mut time_user = result.user_time;
@ -202,7 +202,7 @@ impl Executor for MockExecutor {
Ok((
TimingResult {
time_real: Self::extract_time(command.get_shell_command()),
time_real: Self::extract_time(command.get_command_line()),
time_user: 0.0,
time_system: 0.0,
},

24
src/command.rs
View File

@ -55,12 +55,12 @@ impl<'a> Command<'a> {
pub fn get_name(&self) -> String {
self.name.map_or_else(
|| self.get_shell_command(),
|| self.get_command_line(),
|name| self.replace_parameters_in(name),
)
}
pub fn get_shell_command(&self) -> String {
pub fn get_command_line(&self) -> String {
self.replace_parameters_in(self.expression)
}
@ -82,7 +82,7 @@ impl<'a> Command<'a> {
//
// hyperfine -L foo 'a,{bar}' -L bar 'baz,quux' 'echo {foo} {bar}'
//
// should not ever run 'echo baz baz'. See `test_get_shell_command_nonoverlapping`.
// should not ever run 'echo baz baz'. See `test_get_command_line_nonoverlapping`.
'outer: while let Some(head) = remaining.chars().next() {
for (k, v) in &replacements {
if remaining.starts_with(k.as_str()) {
@ -318,7 +318,7 @@ impl<'a> Commands<'a> {
}
#[test]
fn test_get_shell_command_nonoverlapping() {
fn test_get_command_line_nonoverlapping() {
let cmd = Command::new_parametrized(
None,
"echo {foo} {bar}",
@ -327,7 +327,7 @@ fn test_get_shell_command_nonoverlapping() {
("bar", ParameterValue::Text("quux".into())),
],
);
assert_eq!(cmd.get_shell_command(), "echo {bar} baz quux");
assert_eq!(cmd.get_command_line(), "echo {bar} baz quux");
}
#[test]
@ -345,7 +345,7 @@ fn test_get_parameterized_command_name() {
impl<'a> fmt::Display for Command<'a> {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
write!(f, "{}", self.get_shell_command())
write!(f, "{}", self.get_command_line())
}
}
@ -404,8 +404,8 @@ fn test_build_parameter_list_commands() {
assert_eq!(commands.len(), 2);
assert_eq!(commands[0].get_name(), "name-1");
assert_eq!(commands[1].get_name(), "name-2");
assert_eq!(commands[0].get_shell_command(), "echo 1");
assert_eq!(commands[1].get_shell_command(), "echo 2");
assert_eq!(commands[0].get_command_line(), "echo 1");
assert_eq!(commands[1].get_command_line(), "echo 2");
}
#[test]
@ -427,8 +427,8 @@ fn test_build_parameter_scan_commands() {
assert_eq!(commands.len(), 2);
assert_eq!(commands[0].get_name(), "name-1");
assert_eq!(commands[1].get_name(), "name-2");
assert_eq!(commands[0].get_shell_command(), "echo 1");
assert_eq!(commands[1].get_shell_command(), "echo 2");
assert_eq!(commands[0].get_command_line(), "echo 1");
assert_eq!(commands[1].get_command_line(), "echo 2");
}
#[test]
@ -444,7 +444,7 @@ fn test_parameter_scan_commands_int() {
.unwrap();
assert_eq!(commands.len(), 3);
assert_eq!(commands[2].get_name(), "echo 7");
assert_eq!(commands[2].get_shell_command(), "echo 7");
assert_eq!(commands[2].get_command_line(), "echo 7");
}
#[test]
@ -464,7 +464,7 @@ fn test_parameter_scan_commands_decimal() {
.unwrap();
assert_eq!(commands.len(), 4);
assert_eq!(commands[3].get_name(), "echo 0.99");
assert_eq!(commands[3].get_shell_command(), "echo 0.99");
assert_eq!(commands[3].get_command_line(), "echo 0.99");
}
#[test]