diff --git a/backpack/cli/src/commands/merge/mod.rs b/backpack/cli/src/commands/merge/mod.rs index fb99719..abf2c66 100644 --- a/backpack/cli/src/commands/merge/mod.rs +++ b/backpack/cli/src/commands/merge/mod.rs @@ -5,11 +5,7 @@ use rootcause::prelude::*; use rootcause_backtrace::BacktraceCollector; use tracing::instrument; -use github_bot_lib::{ - cli::Args, - utils::get_repo, - github, -}; +use github_bot_lib::{cli::Args, github, utils::get_repo}; #[instrument(level = "debug", target = "errors::rootcause", name = "run")] pub fn run(target: Option) -> anyhow::Result<()> { diff --git a/backpack/cli/src/main.rs b/backpack/cli/src/main.rs index 9aa2c4c..219d1ed 100644 --- a/backpack/cli/src/main.rs +++ b/backpack/cli/src/main.rs @@ -157,7 +157,7 @@ async fn main() -> anyhow::Result<()> { .unwrap_or_default(), }, ) - .await; + .await; merge::run(target_repo)?; diff --git a/backpack/lib/Cargo.toml b/backpack/lib/Cargo.toml index f05edf2..c8276bc 100644 --- a/backpack/lib/Cargo.toml +++ b/backpack/lib/Cargo.toml @@ -58,7 +58,7 @@ thiserror = "2.0" libc = "0.2" indicatif = "0.18" clap_complete = "4.5.65" -strum = { version = "0.27.2", features = ["derive"] } +strum = { version = "0.28.0", features = ["derive"] } git2 = { workspace = true } chrono = "0.4.42" cliclack = "0.3.7" diff --git a/backpack/lib/src/utils/mod.rs b/backpack/lib/src/utils/mod.rs index a5e05f1..682cd57 100644 --- a/backpack/lib/src/utils/mod.rs +++ b/backpack/lib/src/utils/mod.rs @@ -1,5 +1,5 @@ +use anyhow::{Context, Result, bail}; use dialoguer::Input; -use anyhow::{bail, Result, Context}; use std::process::Command; /// Check if current directory is inside a git repo