From 092b9606ff2b721d858a5c7b2b27a2f9942b4bc4 Mon Sep 17 00:00:00 2001 From: DanConwayDev Date: Wed, 16 Jul 2025 10:10:41 +0100 Subject: chore: nix flake update required running: `cargo fix --allow-dirty --allow-staged` `cargo clippy --fix --allow-dirty -- -D warnings` to fix problems and then manually fixing some too --- tests/git_remote_nostr/push.rs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'tests/git_remote_nostr/push.rs') diff --git a/tests/git_remote_nostr/push.rs b/tests/git_remote_nostr/push.rs index f46b0ea..9f5f492 100644 --- a/tests/git_remote_nostr/push.rs +++ b/tests/git_remote_nostr/push.rs @@ -981,7 +981,7 @@ async fn proposal_three_way_merge_commit_pushed_to_main_leads_to_status_event_is let mut p = CliTester::new_git_with_remote_helper_from_dir(&git_repo.dir, ["push"]); cli_expect_nostr_fetch(&mut p)?; - p.expect(format!("fetching {} ref list over filesystem...\r\n", source_path).as_str())?; + p.expect(format!("fetching {source_path} ref list over filesystem...\r\n").as_str())?; p.expect("list: connecting...\r\n")?; p.expect_eventually("merge commit ")?; // shorthand merge commit id appears in this gap @@ -1137,7 +1137,7 @@ async fn proposal_fast_forward_merge_commits_pushed_to_main_leads_to_status_even let mut p = CliTester::new_git_with_remote_helper_from_dir(&git_repo.dir, ["push"]); cli_expect_nostr_fetch(&mut p)?; - p.expect(format!("fetching {} ref list over filesystem...\r\n", source_path).as_str())?; + p.expect(format!("fetching {source_path} ref list over filesystem...\r\n").as_str())?; p.expect("list: connecting...\r\n")?; p.expect_eventually(format!( "fast-forward merge: create nostr proposal status event for {branch_name}\r\n" @@ -1323,7 +1323,7 @@ async fn proposal_commits_applied_and_pushed_to_main_leads_to_status_event_issue let mut p = CliTester::new_git_with_remote_helper_from_dir(&git_repo.dir, ["push"]); cli_expect_nostr_fetch(&mut p)?; - p.expect(format!("fetching {} ref list over filesystem...\r\n", source_path).as_str())?; + p.expect(format!("fetching {source_path} ref list over filesystem...\r\n").as_str())?; p.expect("list: connecting...\r\n")?; p.expect_eventually(format!( "applied commits from proposal: create nostr proposal status event for {branch_name}\r\n" ))?; @@ -1484,7 +1484,7 @@ async fn push_2_commits_to_existing_proposal() -> Result<()> { let mut p = CliTester::new_git_with_remote_helper_from_dir(&git_repo.dir, ["push"]); cli_expect_nostr_fetch(&mut p)?; - p.expect(format!("fetching {} ref list over filesystem...\r\n", source_path).as_str())?; + p.expect(format!("fetching {source_path} ref list over filesystem...\r\n").as_str())?; p.expect("list: connecting...\r\n\r\r\r")?; p.expect_eventually_and_print(format!("To {}\r\n", get_nostr_remote_url()?).as_str())?; let output = p.expect_end_eventually()?; @@ -1639,7 +1639,7 @@ async fn force_push_creates_proposal_revision() -> Result<()> { let mut p = CliTester::new_git_with_remote_helper_from_dir(&git_repo.dir, ["push", "--force"]); cli_expect_nostr_fetch(&mut p)?; - p.expect(format!("fetching {} ref list over filesystem...\r\n", source_path).as_str())?; + p.expect(format!("fetching {source_path} ref list over filesystem...\r\n").as_str())?; p.expect("list: connecting...\r\n")?; p.expect_eventually_and_print(format!("To {}\r\n", get_nostr_remote_url()?).as_str())?; let output = p.expect_end_eventually()?; @@ -1791,7 +1791,7 @@ async fn push_new_pr_branch_creates_proposal() -> Result<()> { branch_name, ]); cli_expect_nostr_fetch(&mut p)?; - p.expect(format!("fetching {} ref list over filesystem...\r\n", source_path).as_str())?; + p.expect(format!("fetching {source_path} ref list over filesystem...\r\n").as_str())?; p.expect("list: connecting...\r\n\r\r\r")?; p.expect_eventually_and_print(format!("To {}\r\n", get_nostr_remote_url()?).as_str())?; let output = p.expect_end_eventually()?; -- cgit v1.2.3