mirror of
https://github.com/sharkdp/hyperfine.git
synced 2026-11-03 17:27:33 +00:00
Fix clippy warnings from tests
This commit is contained in:
1 parent
f2bfedd3a6
commit
f592155db7
3 files changed
+128
-125
No files matched your search
+112
-116
@@ -89,35 +89,34 @@ fn test_markdown_format_ms() {
|
|||||||
use std::collections::BTreeMap;
|
use std::collections::BTreeMap;
|
||||||
let exporter = MarkdownExporter::default();
|
let exporter = MarkdownExporter::default();
|
||||||
|
|
||||||
let mut timing_results = vec![];
|
let timing_results = vec![
|
||||||
|
BenchmarkResult::new(
|
||||||
timing_results.push(BenchmarkResult::new(
|
String::from("sleep 0.1"),
|
||||||
String::from("sleep 0.1"),
|
0.1057, // mean
|
||||||
0.1057, // mean
|
0.0016, // std dev
|
||||||
0.0016, // std dev
|
0.1057, // median
|
||||||
0.1057, // median
|
0.0009, // user_mean
|
||||||
0.0009, // user_mean
|
0.0011, // system_mean
|
||||||
0.0011, // system_mean
|
0.1023, // min
|
||||||
0.1023, // min
|
0.1080, // max
|
||||||
0.1080, // max
|
vec![0.1, 0.1, 0.1], // times
|
||||||
vec![0.1, 0.1, 0.1], // times
|
vec![Some(0), Some(0), Some(0)], // exit codes
|
||||||
vec![Some(0), Some(0), Some(0)], // exit codes
|
BTreeMap::new(), // parameter
|
||||||
BTreeMap::new(), // parameter
|
),
|
||||||
));
|
BenchmarkResult::new(
|
||||||
|
String::from("sleep 2"),
|
||||||
timing_results.push(BenchmarkResult::new(
|
2.0050, // mean
|
||||||
String::from("sleep 2"),
|
0.0020, // std dev
|
||||||
2.0050, // mean
|
2.0050, // median
|
||||||
0.0020, // std dev
|
0.0009, // user_mean
|
||||||
2.0050, // median
|
0.0012, // system_mean
|
||||||
0.0009, // user_mean
|
2.0020, // min
|
||||||
0.0012, // system_mean
|
2.0080, // max
|
||||||
2.0020, // min
|
vec![2.0, 2.0, 2.0], // times
|
||||||
2.0080, // max
|
vec![Some(0), Some(0), Some(0)], // exit codes
|
||||||
vec![2.0, 2.0, 2.0], // times
|
BTreeMap::new(), // parameter
|
||||||
vec![Some(0), Some(0), Some(0)], // exit codes
|
),
|
||||||
BTreeMap::new(), // parameter
|
];
|
||||||
));
|
|
||||||
|
|
||||||
let formatted = String::from_utf8(exporter.serialize(&timing_results, None).unwrap()).unwrap();
|
let formatted = String::from_utf8(exporter.serialize(&timing_results, None).unwrap()).unwrap();
|
||||||
|
|
||||||
@@ -139,35 +138,34 @@ fn test_markdown_format_s() {
|
|||||||
use std::collections::BTreeMap;
|
use std::collections::BTreeMap;
|
||||||
let exporter = MarkdownExporter::default();
|
let exporter = MarkdownExporter::default();
|
||||||
|
|
||||||
let mut timing_results = vec![];
|
let timing_results = vec![
|
||||||
|
BenchmarkResult::new(
|
||||||
timing_results.push(BenchmarkResult::new(
|
String::from("sleep 2"),
|
||||||
String::from("sleep 2"),
|
2.0050, // mean
|
||||||
2.0050, // mean
|
0.0020, // std dev
|
||||||
0.0020, // std dev
|
2.0050, // median
|
||||||
2.0050, // median
|
0.0009, // user_mean
|
||||||
0.0009, // user_mean
|
0.0012, // system_mean
|
||||||
0.0012, // system_mean
|
2.0020, // min
|
||||||
2.0020, // min
|
2.0080, // max
|
||||||
2.0080, // max
|
vec![2.0, 2.0, 2.0], // times
|
||||||
vec![2.0, 2.0, 2.0], // times
|
vec![Some(0), Some(0), Some(0)], // exit codes
|
||||||
vec![Some(0), Some(0), Some(0)], // exit codes
|
BTreeMap::new(), // parameter
|
||||||
BTreeMap::new(), // parameter
|
),
|
||||||
));
|
BenchmarkResult::new(
|
||||||
|
String::from("sleep 0.1"),
|
||||||
timing_results.push(BenchmarkResult::new(
|
0.1057, // mean
|
||||||
String::from("sleep 0.1"),
|
0.0016, // std dev
|
||||||
0.1057, // mean
|
0.1057, // median
|
||||||
0.0016, // std dev
|
0.0009, // user_mean
|
||||||
0.1057, // median
|
0.0011, // system_mean
|
||||||
0.0009, // user_mean
|
0.1023, // min
|
||||||
0.0011, // system_mean
|
0.1080, // max
|
||||||
0.1023, // min
|
vec![0.1, 0.1, 0.1], // times
|
||||||
0.1080, // max
|
vec![Some(0), Some(0), Some(0)], // exit codes
|
||||||
vec![0.1, 0.1, 0.1], // times
|
BTreeMap::new(), // parameter
|
||||||
vec![Some(0), Some(0), Some(0)], // exit codes
|
),
|
||||||
BTreeMap::new(), // parameter
|
];
|
||||||
));
|
|
||||||
|
|
||||||
let formatted = String::from_utf8(exporter.serialize(&timing_results, None).unwrap()).unwrap();
|
let formatted = String::from_utf8(exporter.serialize(&timing_results, None).unwrap()).unwrap();
|
||||||
|
|
||||||
@@ -188,35 +186,34 @@ fn test_markdown_format_time_unit_s() {
|
|||||||
use std::collections::BTreeMap;
|
use std::collections::BTreeMap;
|
||||||
let exporter = MarkdownExporter::default();
|
let exporter = MarkdownExporter::default();
|
||||||
|
|
||||||
let mut timing_results = vec![];
|
let timing_results = vec![
|
||||||
|
BenchmarkResult::new(
|
||||||
timing_results.push(BenchmarkResult::new(
|
String::from("sleep 0.1"),
|
||||||
String::from("sleep 0.1"),
|
0.1057, // mean
|
||||||
0.1057, // mean
|
0.0016, // std dev
|
||||||
0.0016, // std dev
|
0.1057, // median
|
||||||
0.1057, // median
|
0.0009, // user_mean
|
||||||
0.0009, // user_mean
|
0.0011, // system_mean
|
||||||
0.0011, // system_mean
|
0.1023, // min
|
||||||
0.1023, // min
|
0.1080, // max
|
||||||
0.1080, // max
|
vec![0.1, 0.1, 0.1], // times
|
||||||
vec![0.1, 0.1, 0.1], // times
|
vec![Some(0), Some(0), Some(0)], // exit codes
|
||||||
vec![Some(0), Some(0), Some(0)], // exit codes
|
BTreeMap::new(), // parameter
|
||||||
BTreeMap::new(), // parameter
|
),
|
||||||
));
|
BenchmarkResult::new(
|
||||||
|
String::from("sleep 2"),
|
||||||
timing_results.push(BenchmarkResult::new(
|
2.0050, // mean
|
||||||
String::from("sleep 2"),
|
0.0020, // std dev
|
||||||
2.0050, // mean
|
2.0050, // median
|
||||||
0.0020, // std dev
|
0.0009, // user_mean
|
||||||
2.0050, // median
|
0.0012, // system_mean
|
||||||
0.0009, // user_mean
|
2.0020, // min
|
||||||
0.0012, // system_mean
|
2.0080, // max
|
||||||
2.0020, // min
|
vec![2.0, 2.0, 2.0], // times
|
||||||
2.0080, // max
|
vec![Some(0), Some(0), Some(0)], // exit codes
|
||||||
vec![2.0, 2.0, 2.0], // times
|
BTreeMap::new(), // parameter
|
||||||
vec![Some(0), Some(0), Some(0)], // exit codes
|
),
|
||||||
BTreeMap::new(), // parameter
|
];
|
||||||
));
|
|
||||||
|
|
||||||
let formatted = String::from_utf8(
|
let formatted = String::from_utf8(
|
||||||
exporter
|
exporter
|
||||||
@@ -243,35 +240,34 @@ fn test_markdown_format_time_unit_ms() {
|
|||||||
use std::collections::BTreeMap;
|
use std::collections::BTreeMap;
|
||||||
let exporter = MarkdownExporter::default();
|
let exporter = MarkdownExporter::default();
|
||||||
|
|
||||||
let mut timing_results = vec![];
|
let timing_results = vec![
|
||||||
|
BenchmarkResult::new(
|
||||||
timing_results.push(BenchmarkResult::new(
|
String::from("sleep 2"),
|
||||||
String::from("sleep 2"),
|
2.0050, // mean
|
||||||
2.0050, // mean
|
0.0020, // std dev
|
||||||
0.0020, // std dev
|
2.0050, // median
|
||||||
2.0050, // median
|
0.0009, // user_mean
|
||||||
0.0009, // user_mean
|
0.0012, // system_mean
|
||||||
0.0012, // system_mean
|
2.0020, // min
|
||||||
2.0020, // min
|
2.0080, // max
|
||||||
2.0080, // max
|
vec![2.0, 2.0, 2.0], // times
|
||||||
vec![2.0, 2.0, 2.0], // times
|
vec![Some(0), Some(0), Some(0)], // exit codes
|
||||||
vec![Some(0), Some(0), Some(0)], // exit codes
|
BTreeMap::new(), // parameter
|
||||||
BTreeMap::new(), // parameter
|
),
|
||||||
));
|
BenchmarkResult::new(
|
||||||
|
String::from("sleep 0.1"),
|
||||||
timing_results.push(BenchmarkResult::new(
|
0.1057, // mean
|
||||||
String::from("sleep 0.1"),
|
0.0016, // std dev
|
||||||
0.1057, // mean
|
0.1057, // median
|
||||||
0.0016, // std dev
|
0.0009, // user_mean
|
||||||
0.1057, // median
|
0.0011, // system_mean
|
||||||
0.0009, // user_mean
|
0.1023, // min
|
||||||
0.0011, // system_mean
|
0.1080, // max
|
||||||
0.1023, // min
|
vec![0.1, 0.1, 0.1], // times
|
||||||
0.1080, // max
|
vec![Some(0), Some(0), Some(0)], // exit codes
|
||||||
vec![0.1, 0.1, 0.1], // times
|
BTreeMap::new(), // parameter
|
||||||
vec![Some(0), Some(0), Some(0)], // exit codes
|
),
|
||||||
BTreeMap::new(), // parameter
|
];
|
||||||
));
|
|
||||||
|
|
||||||
let formatted = String::from_utf8(
|
let formatted = String::from_utf8(
|
||||||
exporter
|
exporter
|
||||||
|
|||||||
@@ -84,6 +84,13 @@ impl ExportManager {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
impl Default for ExportManager {
|
||||||
|
/// Create a new default ExportManager
|
||||||
|
fn default() -> Self {
|
||||||
|
ExportManager::new()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// Write the given content to a file with the specified name
|
/// Write the given content to a file with the specified name
|
||||||
fn write_to_file(filename: &str, content: &[u8]) -> Result<()> {
|
fn write_to_file(filename: &str, content: &[u8]) -> Result<()> {
|
||||||
let mut file = OpenOptions::new().write(true).open(filename)?;
|
let mut file = OpenOptions::new().write(true).open(filename)?;
|
||||||
|
|||||||
+9
-9
@@ -386,22 +386,22 @@ fn test_build_commands_cross_product() {
|
|||||||
let matches = get_arg_matches(vec![
|
let matches = get_arg_matches(vec![
|
||||||
"hyperfine",
|
"hyperfine",
|
||||||
"-L",
|
"-L",
|
||||||
"foo",
|
"par1",
|
||||||
"a,b",
|
"a,b",
|
||||||
"-L",
|
"-L",
|
||||||
"bar",
|
"par2",
|
||||||
"z,y",
|
"z,y",
|
||||||
"echo {foo} {bar}",
|
"echo {par1} {par2}",
|
||||||
"printf '%s\n' {foo} {bar}",
|
"printf '%s\n' {par1} {par2}",
|
||||||
]);
|
]);
|
||||||
let result = build_commands(&matches);
|
let result = build_commands(&matches);
|
||||||
|
|
||||||
// Iteration order: command list first, then parameters in listed order (here, "foo" before
|
// Iteration order: command list first, then parameters in listed order (here, "par1" before
|
||||||
// "bar", which is distinct from their sorted order), with parameter values in listed order.
|
// "par2", which is distinct from their sorted order), with parameter values in listed order.
|
||||||
let pv = |s: &str| ParameterValue::Text(s.to_string());
|
let pv = |s: &str| ParameterValue::Text(s.to_string());
|
||||||
let cmd = |cmd: usize, foo: &str, bar: &str| {
|
let cmd = |cmd: usize, par1: &str, par2: &str| {
|
||||||
let expression = ["echo {foo} {bar}", "printf '%s\n' {foo} {bar}"][cmd];
|
let expression = ["echo {par1} {par2}", "printf '%s\n' {par1} {par2}"][cmd];
|
||||||
let params = vec![("foo", pv(foo)), ("bar", pv(bar))];
|
let params = vec![("par1", pv(par1)), ("par2", pv(par2))];
|
||||||
Command::new_parametrized(None, expression, params)
|
Command::new_parametrized(None, expression, params)
|
||||||
};
|
};
|
||||||
let expected = vec![
|
let expected = vec![
|
||||||
|
|||||||
Reference in new issue
Block a user