From 30845c1f3bbe7cddbd3e4620f55c78a5f697afd1 Mon Sep 17 00:00:00 2001 From: Martin von Zweigbergk Date: Sun, 14 Nov 2021 12:46:31 -0800 Subject: [PATCH] cleanup: fix formatting regression --- lib/src/conflicts.rs | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/lib/src/conflicts.rs b/lib/src/conflicts.rs index c97c30303..6b0c33224 100644 --- a/lib/src/conflicts.rs +++ b/lib/src/conflicts.rs @@ -162,10 +162,7 @@ pub fn materialize_conflict( .iter() .map(|part| get_file_contents(store, path, part)) .collect_vec(); - let removed_slices = removed_content - .iter() - .map(Vec::as_slice) - .collect_vec(); + let removed_slices = removed_content.iter().map(Vec::as_slice).collect_vec(); let added_slices = added_content.iter().map(Vec::as_slice).collect_vec(); let merge_result = files::merge(&removed_slices, &added_slices);