`284d89e`

fix clippy: box RunConfig variant, elide lifetime, inline format arg

Authored by

espadonne 1 month ago

SHA: 284d89e8c48e649081e4729b8b8bf59800cf548f
Parents: 96afcc7
Tree: c3a618c

1 changed file

Status	File	+	-
M	`bench/src/lib.rs`	5	5

bench/src/lib.rsmodified


 
 enum CommandKind {
     List { suite_filter: Option<String> },
-    Run(RunConfig),
+    Run(Box<RunConfig>),
     Help,
 }
 

                     other => return Err(format!("unknown run option: {}", other)),
                 }
             }
-            Ok(CommandKind::Run(config))
+            Ok(CommandKind::Run(Box::new(config)))
         }
         "--help" | "-h" | "help" => Ok(CommandKind::Help),
         other => Err(format!("unknown command: {}", other)),

     capture_run_stage(&result).cloned()
 }
 
-fn capture_text_stage<'a>(result: &'a CaptureResult, stage: Stage) -> Result<&'a str, String> {
+fn capture_text_stage(result: &CaptureResult, stage: Stage) -> Result<&str, String> {
     match result.get(stage) {
         Some(CapturedStage::Text(text)) => Ok(text),
         Some(CapturedStage::Run(_)) => Err(format!(

     let (first_name, first_expected, first_actual) = differing[0];
 
     format!(
-        "differing object components: {}\n{}\n{}",
+        "differing object components: {}\nfirst differing component: {}\n{}",
         component_list,
-        format!("first differing component: {}", first_name),
+        first_name,
         describe_text_difference(first_expected, first_actual, left_label, right_label)
     )
 }

`@@ -488,7 +488,7 @@` pub fn run_cli(args: &[String]) -> i32 {
488	488
489	489	enum CommandKind {
490	490	List { suite_filter: Option<String> },
491		- Run(RunConfig),
	491	+ Run(Box<RunConfig>),
492	492	Help,
493	493	}
494	494
`@@ -575,7 +575,7 @@` fn parse_cli(args: &[String]) -> Result<CommandKind, String> {
575	575	other => return Err(format!("unknown run option: {}", other)),
576	576	}
577	577	}
578		- Ok(CommandKind::Run(config))
	578	+ Ok(CommandKind::Run(Box::new(config)))
579	579	}
580	580	"--help" \| "-h" \| "help" => Ok(CommandKind::Help),
581	581	other => Err(format!("unknown command: {}", other)),
`@@ -3668,7 +3668,7 @@` fn capture_run_from_testing(source: &Path, opt_level: OptLevel) -> Result<RunCap
3668	3668	capture_run_stage(&result).cloned()
3669	3669	}
3670	3670
3671		-fn capture_text_stage<'a>(result: &'a CaptureResult, stage: Stage) -> Result<&'a str, String> {
	3671	+fn capture_text_stage(result: &CaptureResult, stage: Stage) -> Result<&str, String> {
3672	3672	match result.get(stage) {
3673	3673	Some(CapturedStage::Text(text)) => Ok(text),
3674	3674	Some(CapturedStage::Run(_)) => Err(format!(
`@@ -4066,9 +4066,9 @@` fn describe_object_difference(
4066	4066	let (first_name, first_expected, first_actual) = differing[0];
4067	4067
4068	4068	format!(
4069		- "differing object components: {}\n{}\n{}",
	4069	+ "differing object components: {}\nfirst differing component: {}\n{}",
4070	4070	component_list,
4071		- format!("first differing component: {}", first_name),
	4071	+ first_name,
4072	4072	describe_text_difference(first_expected, first_actual, left_label, right_label)
4073	4073	)
4074	4074	}