From 3fed5eec4b311879d562a6f8871aace9e22f6077 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 1 Apr 2025 02:05:26 +0000 Subject: [PATCH 1/2] chore(deps): Update compatible --- Cargo.lock | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 82b738f..08fa1a6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -122,9 +122,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "clap" -version = "4.5.31" +version = "4.5.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "027bb0d98429ae334a8698531da7077bdf906419543a35a55c2cb1b66437d767" +checksum = "e958897981290da2a852763fe9cdb89cd36977a5d729023127095fa94d95e2ff" dependencies = [ "clap_builder", "clap_derive", @@ -142,9 +142,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.31" +version = "4.5.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5589e0cba072e0f3d23791efac0fd8627b49c829c196a492e88168e6a669d863" +checksum = "83b0f35019843db2160b5bb19ae09b4e6411ac33fc6a712003c33e03090e2489" dependencies = [ "anstream", "anstyle", @@ -154,9 +154,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.28" +version = "4.5.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4ced95c6f4a675af3da73304b9ac4ed991640c36374e4b46795c49e17cf1ed" +checksum = "09176aae279615badda0765c0c0b3f6ed53f4709118af73cf4655d85d1530cd7" dependencies = [ "heck", "proc-macro2", @@ -233,9 +233,9 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.11.6" +version = "0.11.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcaee3d8e3cfc3fd92428d477bc97fc29ec8716d180c0d74c643bb26166660e0" +checksum = "c3716d7a920fb4fac5d84e9d4bce8ceb321e9414b4409da61b07b75c1e3d0697" dependencies = [ "anstream", "anstyle", @@ -533,9 +533,9 @@ checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "log" -version = "0.4.26" +version = "0.4.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30bde2b3dc3671ae49d8e2e9f044c7c005836e7a023ee57cffa25ab82764bb9e" +checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94" [[package]] name = "maplit" @@ -662,18 +662,18 @@ checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" [[package]] name = "serde" -version = "1.0.218" +version = "1.0.219" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8dfc9d19bdbf6d17e22319da49161d5d0108e4188e8b680aef6299eed22df60" +checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.218" +version = "1.0.219" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f09503e191f4e797cb8aac08e9a4a4695c5edf6a2e70e376d961ddd5c969f82b" +checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" dependencies = [ "proc-macro2", "quote", From 71e5449e0e19416949a98dbc1b3ca1f052cde56a Mon Sep 17 00:00:00 2001 From: Ed Page Date: Tue, 1 Apr 2025 11:43:52 -0500 Subject: [PATCH 2/2] style: Make clippy happy --- crates/git-branch-stash/src/config.rs | 10 +++++----- crates/git-branch-stash/src/snapshot.rs | 4 ++-- crates/git-branch-stash/src/stack.rs | 2 +- src/main.rs | 12 ++++-------- 4 files changed, 12 insertions(+), 16 deletions(-) diff --git a/crates/git-branch-stash/src/config.rs b/crates/git-branch-stash/src/config.rs index 493f0f5..ba7e3fb 100644 --- a/crates/git-branch-stash/src/config.rs +++ b/crates/git-branch-stash/src/config.rs @@ -17,7 +17,7 @@ impl RepoConfig { let default_config = match git2::Config::open_default() { Ok(config) => Some(config), Err(err) => { - log::debug!("Failed to load git config: {}", err); + log::debug!("Failed to load git config: {err}"); None } }; @@ -40,7 +40,7 @@ impl RepoConfig { match git2::Config::open(&config_path) { Ok(config) => Ok(Self::from_gitconfig(&config)), Err(err) => { - log::debug!("Failed to load git config: {}", err); + log::debug!("Failed to load git config: {err}"); Ok(Default::default()) } } @@ -59,7 +59,7 @@ impl RepoConfig { match git2::Config::open(&config_path) { Ok(config) => Ok(Self::from_gitconfig(&config)), Err(err) => { - log::debug!("Failed to load git config: {}", err); + log::debug!("Failed to load git config: {err}"); Ok(Default::default()) } } @@ -88,7 +88,7 @@ impl RepoConfig { let mut config = Self::default(); for (key, value) in iter { - log::trace!("Env config: {}={:?}", key, value); + log::trace!("Env config: {key}={value:?}"); if key == PROTECTED_STACK_FIELD { if let Some(value) = value { config @@ -115,7 +115,7 @@ impl RepoConfig { let config = match git2::Config::open_default() { Ok(config) => Some(config), Err(err) => { - log::debug!("Failed to load git config: {}", err); + log::debug!("Failed to load git config: {err}"); None } }; diff --git a/crates/git-branch-stash/src/snapshot.rs b/crates/git-branch-stash/src/snapshot.rs index 5a3aba9..e83681a 100644 --- a/crates/git-branch-stash/src/snapshot.rs +++ b/crates/git-branch-stash/src/snapshot.rs @@ -76,12 +76,12 @@ impl Snapshot { for (_old_id, new_id, name) in &planned_changes { if head_branch_name == Some(name) { - log::debug!("Restoring {} (HEAD)", name); + log::debug!("Restoring {name} (HEAD)"); repo.detach()?; repo.branch(name, *new_id)?; repo.switch(name)?; } else { - log::debug!("Restoring {}", name); + log::debug!("Restoring {name}"); repo.branch(name, *new_id)?; } } diff --git a/crates/git-branch-stash/src/stack.rs b/crates/git-branch-stash/src/stack.rs index 686f4e9..d2827e2 100644 --- a/crates/git-branch-stash/src/stack.rs +++ b/crates/git-branch-stash/src/stack.rs @@ -104,7 +104,7 @@ impl Stack { let len = elems.len(); if capacity < len { let remove = len - capacity; - log::debug!("Too many snapshots, clearing {} oldest", remove); + log::debug!("Too many snapshots, clearing {remove} oldest"); for snapshot_path in &elems[0..remove] { if let Err(err) = std::fs::remove_file(snapshot_path) { log::debug!("Failed to remove {}: {}", snapshot_path.display(), err); diff --git a/src/main.rs b/src/main.rs index dd15808..3a36124 100644 --- a/src/main.rs +++ b/src/main.rs @@ -271,15 +271,11 @@ fn stash_push(repo: &mut git_branch_stash::GitRepo, context: &str) -> Option { - log::info!( - "Saved working directory and index state {}: {}", - stash_msg, - stash_id - ); + log::info!("Saved working directory and index state {stash_msg}: {stash_id}"); Some(stash_id) } Err(err) => { - log::debug!("Failed to stash: {}", err); + log::debug!("Failed to stash: {err}"); None } } @@ -304,10 +300,10 @@ fn stash_pop(repo: &mut git_branch_stash::GitRepo, stash_id: Option) match repo.raw_mut().stash_pop(index, None) { Ok(()) => { - log::info!("Dropped refs/stash {}", stash_id); + log::info!("Dropped refs/stash {stash_id}"); } Err(err) => { - log::error!("Failed to pop {} from stash: {}", stash_id, err); + log::error!("Failed to pop {stash_id} from stash: {err}"); } } }