Skip to content

Commit

Permalink
Cargo fmt
Browse files Browse the repository at this point in the history
  • Loading branch information
Timmmm committed Nov 24, 2023
1 parent 0b88bac commit fd98eab
Show file tree
Hide file tree
Showing 8 changed files with 74 additions and 10 deletions.
3 changes: 2 additions & 1 deletion tests/tests/all_branches.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ fn with_include(include_all_branches: bool) -> BTreeMap<String, CommitGraphNode>

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);

Expand Down
9 changes: 8 additions & 1 deletion tests/tests/basic.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
9 changes: 8 additions & 1 deletion tests/tests/basic_conflict.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
27 changes: 24 additions & 3 deletions tests/tests/checked_out.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down Expand Up @@ -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);

Expand Down Expand Up @@ -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);

Expand Down
9 changes: 8 additions & 1 deletion tests/tests/conflict_resume.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
9 changes: 8 additions & 1 deletion tests/tests/multiple_branches.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
9 changes: 8 additions & 1 deletion tests/tests/multiple_refs_on_branch.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
9 changes: 8 additions & 1 deletion tests/tests/random.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down

0 comments on commit fd98eab

Please sign in to comment.