From 91a68de459b7d22a8dfb8a324e43740fca3e0a35 Mon Sep 17 00:00:00 2001 From: DanConwayDev Date: Fri, 22 Mar 2024 07:35:24 +0000 Subject: chore: nix flake update update nix dependancies to latest version using default update options --- flake.lock | 18 +++++++++--------- src/git.rs | 4 +++- src/main.rs | 4 ++-- src/sub_commands/list.rs | 10 +--------- src/sub_commands/send.rs | 2 +- test_utils/src/lib.rs | 2 +- 6 files changed, 17 insertions(+), 23 deletions(-) diff --git a/flake.lock b/flake.lock index 93f638d..cec2950 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -38,11 +38,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1706550542, - "narHash": "sha256-UcsnCG6wx++23yeER4Hg18CXWbgNpqNXcHIo5/1Y+hc=", + "lastModified": 1710806803, + "narHash": "sha256-qrxvLS888pNJFwJdK+hf1wpRCSQcqA6W5+Ox202NDa0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "97b17f32362e475016f942bbdfda4a4a72a8a652", + "rev": "b06025f1533a1e07b6db3e75151caa155d1c7eb3", "type": "github" }, "original": { @@ -81,11 +81,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1706667075, - "narHash": "sha256-KBI5jcOWh9nsOFWj2SRq7vj+fPDf8Do8ceL582kFA70=", + "lastModified": 1711073443, + "narHash": "sha256-PpNb4xq7U5Q/DdX40qe7CijUsqhVVM3VZrhN0+c6Lcw=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "2c993daf3136c6955fd13bfe215d0d4faf6090f1", + "rev": "eec55ba9fcde6be4c63942827247e42afef7fafe", "type": "github" }, "original": { diff --git a/src/git.rs b/src/git.rs index 5afb1e4..86b59fb 100644 --- a/src/git.rs +++ b/src/git.rs @@ -45,9 +45,11 @@ pub trait RepoActions { fn get_commit_parent(&self, commit: &Sha1Hash) -> Result; fn get_commit_message(&self, commit: &Sha1Hash) -> Result; fn get_commit_message_summary(&self, commit: &Sha1Hash) -> Result; + #[allow(clippy::doc_link_with_quotes)] /// returns vector ["name", "email", "unixtime", "offset"] /// eg ["joe bloggs", "joe@pm.me", "12176","-300"] fn get_commit_author(&self, commit: &Sha1Hash) -> Result>; + #[allow(clippy::doc_link_with_quotes)] /// returns vector ["name", "email", "unixtime", "offset"] /// eg ["joe bloggs", "joe@pm.me", "12176","-300"] fn get_commit_comitter(&self, commit: &Sha1Hash) -> Result>; @@ -1681,7 +1683,7 @@ mod tests { let mut events = generate_cover_letter_and_patch_events( Some(("test".to_string(), "test".to_string())), &git_repo, - &vec![oid_to_sha1(&oid1), oid_to_sha1(&oid2), oid_to_sha1(&oid3)], + &[oid_to_sha1(&oid1), oid_to_sha1(&oid2), oid_to_sha1(&oid3)], &TEST_KEY_1_KEYS, &RepoRef::try_from(generate_repo_ref_event()).unwrap(), &None, diff --git a/src/main.rs b/src/main.rs index adffdec..30ecea3 100644 --- a/src/main.rs +++ b/src/main.rs @@ -37,7 +37,7 @@ enum Commands { /// issue commits as a proposal Send(sub_commands::send::SubCommandArgs), /// list proposals; checkout, apply or download selected - List(sub_commands::list::SubCommandArgs), + List, /// send proposal revision Push(sub_commands::push::SubCommandArgs), /// fetch and apply new proposal commits / revisions linked to branch @@ -53,7 +53,7 @@ async fn main() -> Result<()> { Commands::Login(args) => sub_commands::login::launch(&cli, args).await, Commands::Init(args) => sub_commands::init::launch(&cli, args).await, Commands::Send(args) => sub_commands::send::launch(&cli, args).await, - Commands::List(args) => sub_commands::list::launch(&cli, args).await, + Commands::List => sub_commands::list::launch().await, Commands::Pull => sub_commands::pull::launch().await, Commands::Push(args) => sub_commands::push::launch(&cli, args).await, } diff --git a/src/sub_commands/list.rs b/src/sub_commands/list.rs index 102c3bd..2d81164 100644 --- a/src/sub_commands/list.rs +++ b/src/sub_commands/list.rs @@ -16,18 +16,10 @@ use crate::{ commit_msg_from_patch_oneliner, event_is_cover_letter, event_is_revision_root, event_to_cover_letter, patch_supports_commit_ids, PATCH_KIND, }, - Cli, }; -#[derive(Debug, clap::Args)] -pub struct SubCommandArgs { - /// TODO ignore merged, and closed - #[arg(long, action)] - open_only: bool, -} - #[allow(clippy::too_many_lines)] -pub async fn launch(_cli_args: &Cli, _args: &SubCommandArgs) -> Result<()> { +pub async fn launch() -> Result<()> { let git_repo = Repo::discover().context("cannot find a git repository")?; let root_commit = git_repo diff --git a/src/sub_commands/send.rs b/src/sub_commands/send.rs index 81cecd8..35c2c81 100644 --- a/src/sub_commands/send.rs +++ b/src/sub_commands/send.rs @@ -518,7 +518,7 @@ pub static PATCH_KIND: u64 = 1617; pub fn generate_cover_letter_and_patch_events( cover_letter_title_description: Option<(String, String)>, git_repo: &Repo, - commits: &Vec, + commits: &[Sha1Hash], keys: &nostr::Keys, repo_ref: &RepoRef, in_reply_to: &Option, diff --git a/test_utils/src/lib.rs b/test_utils/src/lib.rs index 2edbc60..a0c67df 100644 --- a/test_utils/src/lib.rs +++ b/test_utils/src/lib.rs @@ -574,7 +574,7 @@ impl CliTesterChoicePrompt<'_> { fn show_options( tester: &mut CliTester, - choices: &Vec, + choices: &[String], selected_index: Option, ) -> Result<()> { if selected_index.is_some() { -- cgit v1.2.3