Skip to content

Commit 1aaeb69

Browse files
renovate[bot]epage
andauthored
chore(deps): Update compatible (#126)
This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [clap](https://redirect.github.com/clap-rs/clap) | dependencies | patch | `4.5.31` -> `4.5.34` | | [env_logger](https://redirect.github.com/rust-cli/env_logger) | dependencies | patch | `0.11.6` -> `0.11.7` | | [log](https://redirect.github.com/rust-lang/log) | dependencies | patch | `0.4.26` -> `0.4.27` | | [serde](https://serde.rs) ([source](https://redirect.github.com/serde-rs/serde)) | dependencies | patch | `1.0.218` -> `1.0.219` | --- ### Release Notes <details> <summary>clap-rs/clap (clap)</summary> ### [`v4.5.34`](https://redirect.github.com/clap-rs/clap/blob/HEAD/CHANGELOG.md#4534---2025-03-27) [Compare Source](https://redirect.github.com/clap-rs/clap/compare/v4.5.33...v4.5.34) ##### Fixes - *(help)* Don't add extra blank lines with `flatten_help(true)` and subcommands without arguments ### [`v4.5.33`](https://redirect.github.com/clap-rs/clap/blob/HEAD/CHANGELOG.md#4533---2025-03-26) [Compare Source](https://redirect.github.com/clap-rs/clap/compare/v4.5.32...v4.5.33) ##### Fixes - *(error)* When showing the usage of a suggestion for an unknown argument, don't show the group ### [`v4.5.32`](https://redirect.github.com/clap-rs/clap/blob/HEAD/CHANGELOG.md#4532---2025-03-10) [Compare Source](https://redirect.github.com/clap-rs/clap/compare/v4.5.31...v4.5.32) ##### Features - Add `Error::remove` ##### Documentation - *(cookbook)* Switch from `humantime` to `jiff` - *(tutorial)* Better cover required vs optional ##### Internal - Update `pulldown-cmark` </details> <details> <summary>rust-cli/env_logger (env_logger)</summary> ### [`v0.11.7`](https://redirect.github.com/rust-cli/env_logger/blob/HEAD/CHANGELOG.md#0117---2025-03-10) [Compare Source](https://redirect.github.com/rust-cli/env_logger/compare/v0.11.6...v0.11.7) ##### Internal - Replaced `humantime` with `jiff` </details> <details> <summary>rust-lang/log (log)</summary> ### [`v0.4.27`](https://redirect.github.com/rust-lang/log/blob/HEAD/CHANGELOG.md#0427---2025-03-24) [Compare Source](https://redirect.github.com/rust-lang/log/compare/0.4.26...0.4.27) ##### What's Changed - A few minor lint fixes by [@&#8203;nyurik](https://redirect.github.com/nyurik) in [https://github.com/rust-lang/log/pull/671](https://redirect.github.com/rust-lang/log/pull/671) - Enable clippy support for format-like macros by [@&#8203;nyurik](https://redirect.github.com/nyurik) in [https://github.com/rust-lang/log/pull/665](https://redirect.github.com/rust-lang/log/pull/665) - Add an optional logger param by [@&#8203;tisonkun](https://redirect.github.com/tisonkun) in [https://github.com/rust-lang/log/pull/664](https://redirect.github.com/rust-lang/log/pull/664) - Pass global logger by value, supplied logger by ref by [@&#8203;KodrAus](https://redirect.github.com/KodrAus) in [https://github.com/rust-lang/log/pull/673](https://redirect.github.com/rust-lang/log/pull/673) **Full Changelog**: rust-lang/log@0.4.26...0.4.27 </details> <details> <summary>serde-rs/serde (serde)</summary> ### [`v1.0.219`](https://redirect.github.com/serde-rs/serde/releases/tag/v1.0.219) [Compare Source](https://redirect.github.com/serde-rs/serde/compare/v1.0.218...v1.0.219) - Prevent `absolute_paths` Clippy restriction being triggered inside macro-generated code ([#&#8203;2906](https://redirect.github.com/serde-rs/serde/issues/2906), thanks [@&#8203;davidzeng0](https://redirect.github.com/davidzeng0)) </details> --- ### Configuration 📅 **Schedule**: Branch creation - "before 5am on the first day of the month" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. 👻 **Immortal**: This PR will be recreated if closed unmerged. Get [config help](https://redirect.github.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/gitext-rs/git-branch-stash). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOS4yMDcuMSIsInVwZGF0ZWRJblZlciI6IjM5LjIwNy4xIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6W119--> --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Ed Page <[email protected]>
1 parent 7888bb1 commit 1aaeb69

File tree

5 files changed

+26
-30
lines changed

5 files changed

+26
-30
lines changed

Cargo.lock

Lines changed: 14 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crates/git-branch-stash/src/config.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ impl RepoConfig {
1717
let default_config = match git2::Config::open_default() {
1818
Ok(config) => Some(config),
1919
Err(err) => {
20-
log::debug!("Failed to load git config: {}", err);
20+
log::debug!("Failed to load git config: {err}");
2121
None
2222
}
2323
};
@@ -40,7 +40,7 @@ impl RepoConfig {
4040
match git2::Config::open(&config_path) {
4141
Ok(config) => Ok(Self::from_gitconfig(&config)),
4242
Err(err) => {
43-
log::debug!("Failed to load git config: {}", err);
43+
log::debug!("Failed to load git config: {err}");
4444
Ok(Default::default())
4545
}
4646
}
@@ -59,7 +59,7 @@ impl RepoConfig {
5959
match git2::Config::open(&config_path) {
6060
Ok(config) => Ok(Self::from_gitconfig(&config)),
6161
Err(err) => {
62-
log::debug!("Failed to load git config: {}", err);
62+
log::debug!("Failed to load git config: {err}");
6363
Ok(Default::default())
6464
}
6565
}
@@ -88,7 +88,7 @@ impl RepoConfig {
8888
let mut config = Self::default();
8989

9090
for (key, value) in iter {
91-
log::trace!("Env config: {}={:?}", key, value);
91+
log::trace!("Env config: {key}={value:?}");
9292
if key == PROTECTED_STACK_FIELD {
9393
if let Some(value) = value {
9494
config
@@ -115,7 +115,7 @@ impl RepoConfig {
115115
let config = match git2::Config::open_default() {
116116
Ok(config) => Some(config),
117117
Err(err) => {
118-
log::debug!("Failed to load git config: {}", err);
118+
log::debug!("Failed to load git config: {err}");
119119
None
120120
}
121121
};

crates/git-branch-stash/src/snapshot.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,12 +76,12 @@ impl Snapshot {
7676

7777
for (_old_id, new_id, name) in &planned_changes {
7878
if head_branch_name == Some(name) {
79-
log::debug!("Restoring {} (HEAD)", name);
79+
log::debug!("Restoring {name} (HEAD)");
8080
repo.detach()?;
8181
repo.branch(name, *new_id)?;
8282
repo.switch(name)?;
8383
} else {
84-
log::debug!("Restoring {}", name);
84+
log::debug!("Restoring {name}");
8585
repo.branch(name, *new_id)?;
8686
}
8787
}

crates/git-branch-stash/src/stack.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ impl Stack {
104104
let len = elems.len();
105105
if capacity < len {
106106
let remove = len - capacity;
107-
log::debug!("Too many snapshots, clearing {} oldest", remove);
107+
log::debug!("Too many snapshots, clearing {remove} oldest");
108108
for snapshot_path in &elems[0..remove] {
109109
if let Err(err) = std::fs::remove_file(snapshot_path) {
110110
log::debug!("Failed to remove {}: {}", snapshot_path.display(), err);

src/main.rs

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -271,15 +271,11 @@ fn stash_push(repo: &mut git_branch_stash::GitRepo, context: &str) -> Option<git
271271

272272
match stash_id {
273273
Ok(stash_id) => {
274-
log::info!(
275-
"Saved working directory and index state {}: {}",
276-
stash_msg,
277-
stash_id
278-
);
274+
log::info!("Saved working directory and index state {stash_msg}: {stash_id}");
279275
Some(stash_id)
280276
}
281277
Err(err) => {
282-
log::debug!("Failed to stash: {}", err);
278+
log::debug!("Failed to stash: {err}");
283279
None
284280
}
285281
}
@@ -304,10 +300,10 @@ fn stash_pop(repo: &mut git_branch_stash::GitRepo, stash_id: Option<git2::Oid>)
304300

305301
match repo.raw_mut().stash_pop(index, None) {
306302
Ok(()) => {
307-
log::info!("Dropped refs/stash {}", stash_id);
303+
log::info!("Dropped refs/stash {stash_id}");
308304
}
309305
Err(err) => {
310-
log::error!("Failed to pop {} from stash: {}", stash_id, err);
306+
log::error!("Failed to pop {stash_id} from stash: {err}");
311307
}
312308
}
313309
}

0 commit comments

Comments
 (0)