From fd98eab2531b6d5ab4f5c6bcc420bb2393a896d6 Mon Sep 17 00:00:00 2001 From: Tim Hutt Date: Fri, 24 Nov 2023 16:27:54 +0000 Subject: [PATCH] Cargo fmt --- tests/tests/all_branches.rs | 3 ++- tests/tests/basic.rs | 9 ++++++++- tests/tests/basic_conflict.rs | 9 ++++++++- tests/tests/checked_out.rs | 27 +++++++++++++++++++++++--- tests/tests/conflict_resume.rs | 9 ++++++++- tests/tests/multiple_branches.rs | 9 ++++++++- tests/tests/multiple_refs_on_branch.rs | 9 ++++++++- tests/tests/random.rs | 9 ++++++++- 8 files changed, 74 insertions(+), 10 deletions(-) diff --git a/tests/tests/all_branches.rs b/tests/tests/all_branches.rs index ea7f7dd..f87a40f 100644 --- a/tests/tests/all_branches.rs +++ b/tests/tests/all_branches.rs @@ -23,7 +23,8 @@ fn with_include(include_all_branches: bool) -> BTreeMap print_git_log_graph(&repo_dir); - autorebase(repo_dir, Some("master"), false, include_all_branches, None).expect("error autorebasing"); + autorebase(repo_dir, Some("master"), false, include_all_branches, None) + .expect("error autorebasing"); print_git_log_graph(&repo_dir); diff --git a/tests/tests/basic.rs b/tests/tests/basic.rs index 3250a79..8e5aab7 100644 --- a/tests/tests/basic.rs +++ b/tests/tests/basic.rs @@ -63,7 +63,14 @@ fn basic_autorebase(slow_conflict_detection: bool) { print_git_log_graph(&repo_dir); - autorebase(repo_dir, Some("master"), slow_conflict_detection, false, None).expect("error autorebasing"); + autorebase( + repo_dir, + Some("master"), + slow_conflict_detection, + false, + None, + ) + .expect("error autorebasing"); print_git_log_graph(&repo_dir); diff --git a/tests/tests/basic_conflict.rs b/tests/tests/basic_conflict.rs index 4667388..9478768 100644 --- a/tests/tests/basic_conflict.rs +++ b/tests/tests/basic_conflict.rs @@ -34,7 +34,14 @@ fn conflict(slow_conflict_detection: bool) { print_git_log_graph(&repo_dir); - autorebase(repo_dir, Some("master"), slow_conflict_detection, false, None).expect("error autorebasing"); + autorebase( + repo_dir, + Some("master"), + slow_conflict_detection, + false, + None, + ) + .expect("error autorebasing"); print_git_log_graph(&repo_dir); diff --git a/tests/tests/checked_out.rs b/tests/tests/checked_out.rs index 33b2c9f..075c1be 100644 --- a/tests/tests/checked_out.rs +++ b/tests/tests/checked_out.rs @@ -27,7 +27,14 @@ fn checkedout_clean(slow_conflict_detection: bool) { print_git_log_graph(&repo_dir); - autorebase(repo_dir, Some("master"), slow_conflict_detection, false, None).expect("error autorebasing"); + autorebase( + repo_dir, + Some("master"), + slow_conflict_detection, + false, + None, + ) + .expect("error autorebasing"); print_git_log_graph(&repo_dir); @@ -88,7 +95,14 @@ fn checkedout_dirty(slow_conflict_detection: bool) { print_git_log_graph(&repo_dir); - autorebase(repo_dir, Some("master"), slow_conflict_detection, false, None).expect("error autorebasing"); + autorebase( + repo_dir, + Some("master"), + slow_conflict_detection, + false, + None, + ) + .expect("error autorebasing"); print_git_log_graph(&repo_dir); @@ -156,7 +170,14 @@ fn checked_out_conflict(slow_conflict_detection: bool) { print_git_log_graph(&repo_dir); - autorebase(repo_dir, Some("master"), slow_conflict_detection, false, None).expect("error autorebasing"); + autorebase( + repo_dir, + Some("master"), + slow_conflict_detection, + false, + None, + ) + .expect("error autorebasing"); print_git_log_graph(&repo_dir); diff --git a/tests/tests/conflict_resume.rs b/tests/tests/conflict_resume.rs index fc1f7b6..542f9f9 100644 --- a/tests/tests/conflict_resume.rs +++ b/tests/tests/conflict_resume.rs @@ -40,7 +40,14 @@ fn conflict_resume(slow_conflict_detection: bool) { print_git_log_graph(&repo_dir); - autorebase(repo_dir, Some("master"), slow_conflict_detection, false, None).expect("error autorebasing"); + autorebase( + repo_dir, + Some("master"), + slow_conflict_detection, + false, + None, + ) + .expect("error autorebasing"); print_git_log_graph(&repo_dir); diff --git a/tests/tests/multiple_branches.rs b/tests/tests/multiple_branches.rs index 56b8e35..d413800 100644 --- a/tests/tests/multiple_branches.rs +++ b/tests/tests/multiple_branches.rs @@ -27,7 +27,14 @@ fn multiple_branches(slow_conflict_detection: bool) { print_git_log_graph(&repo_dir); - autorebase(repo_dir, Some("master"), slow_conflict_detection, false, None).expect("error autorebasing"); + autorebase( + repo_dir, + Some("master"), + slow_conflict_detection, + false, + None, + ) + .expect("error autorebasing"); print_git_log_graph(&repo_dir); diff --git a/tests/tests/multiple_refs_on_branch.rs b/tests/tests/multiple_refs_on_branch.rs index a3b5598..220a33a 100644 --- a/tests/tests/multiple_refs_on_branch.rs +++ b/tests/tests/multiple_refs_on_branch.rs @@ -31,7 +31,14 @@ fn multiple_branches(slow_conflict_detection: bool) { print_git_log_graph(&repo_dir); - autorebase(repo_dir, Some("master"), slow_conflict_detection, false, None).expect("error autorebasing"); + autorebase( + repo_dir, + Some("master"), + slow_conflict_detection, + false, + None, + ) + .expect("error autorebasing"); print_git_log_graph(&repo_dir); diff --git a/tests/tests/random.rs b/tests/tests/random.rs index a9ef755..3383be5 100644 --- a/tests/tests/random.rs +++ b/tests/tests/random.rs @@ -23,7 +23,14 @@ fn random_test(slow_conflict_detection: bool) { print_git_log_graph(&repo_dir); - autorebase(repo_dir, Some("master"), slow_conflict_detection, false, None).expect("error autorebasing"); + autorebase( + repo_dir, + Some("master"), + slow_conflict_detection, + false, + None, + ) + .expect("error autorebasing"); print_git_log_graph(&repo_dir);