From 84c4f3801c2e21aa93b4adbcd95b3ed0d260cc8f Mon Sep 17 00:00:00 2001 From: Joao Duarte Date: Thu, 7 Dec 2023 21:37:24 -0300 Subject: [PATCH] refactor: Simplify code --- bin/src/control.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/src/control.rs b/bin/src/control.rs index 061036a..70c22fb 100644 --- a/bin/src/control.rs +++ b/bin/src/control.rs @@ -73,7 +73,7 @@ pub fn run_tool_on_merge_scenario( &matchings_right_base, &matchings_left_right, ) - .map_err(|error| ExecutionError::MergeError(error))?; + .map_err(ExecutionError::MergeError)?; match result.has_conflict() { true => Ok(ExecutionResult::WithConflicts(result.to_string())),