From 07126d59b532f7d26fabe56d53e285b25748821a Mon Sep 17 00:00:00 2001 From: Joao Duarte Date: Sat, 27 Jul 2024 01:26:12 -0300 Subject: [PATCH] style: Apply code formatting --- bin/src/control.rs | 18 ++++++++++++++---- merge/src/merge_terminals.rs | 2 +- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/bin/src/control.rs b/bin/src/control.rs index cc35693..036e855 100644 --- a/bin/src/control.rs +++ b/bin/src/control.rs @@ -1,6 +1,7 @@ use std::{ error::Error, - fmt::{self, Display}, time::Instant, + fmt::{self, Display}, + time::Instant, }; use matching::MatchingEntry; @@ -79,17 +80,26 @@ pub fn run_tool_on_merge_scenario( let start = Instant::now(); log::info!("Started calculation of matchings between left and base"); let matchings_left_base = matching::calculate_matchings(&left_tree, &base_tree); - log::info!("Finished calculation of matchings between left and base in {:?}", start.elapsed()); + log::info!( + "Finished calculation of matchings between left and base in {:?}", + start.elapsed() + ); let start = Instant::now(); log::info!("Started calculation of matchings between right and base"); let matchings_right_base = matching::calculate_matchings(&right_tree, &base_tree); - log::info!("Finished calculation of matchings between right and base in {:?}", start.elapsed()); + log::info!( + "Finished calculation of matchings between right and base in {:?}", + start.elapsed() + ); let start = Instant::now(); log::info!("Started calculation of matchings between left and right"); let matchings_left_right = matching::calculate_matchings(&left_tree, &right_tree); - log::info!("Finished calculation of matchings between left and right in {:?}", start.elapsed()); + log::info!( + "Finished calculation of matchings between left and right in {:?}", + start.elapsed() + ); let start = Instant::now(); log::info!("Starting merge of the trees"); diff --git a/merge/src/merge_terminals.rs b/merge/src/merge_terminals.rs index 4ca2c8c..53f322b 100644 --- a/merge/src/merge_terminals.rs +++ b/merge/src/merge_terminals.rs @@ -8,7 +8,7 @@ pub fn merge_terminals<'a>( right: &'a Terminal<'a>, ) -> Result, MergeError> { log::trace!("Calling merge terminal"); - + // Nodes of different kind, early return if left.kind != right.kind { return Err(MergeError::NodesWithDifferentKinds(