Skip to content

Commit ab2fee1

Browse files
ByronByron
authored
Merge pull request #2568 from GitoxideLabs/dependabot/cargo/cargo-56d6b174d8
Bump the cargo group across 1 directory with 10 updates
2 parents 15972f5 + 2cb17b2 commit ab2fee1

823 files changed

Lines changed: 2693 additions & 2366 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Cargo.lock‎

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

‎Cargo.toml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,12 @@ name = "gitoxide"
55
description = "A command-line application for interacting with git repositories"
66
repository = "https://github.com/GitoxideLabs/gitoxide"
77
authors = ["Sebastian Thiel <sebastian.thiel@icloud.com>"]
8-
edition = "2021"
8+
edition = "2024"
99
license = "MIT OR Apache-2.0"
1010
version = "0.53.0"
11-
rust-version = "1.82"
11+
# Rust 1.85 is required so hash-related dependencies can use Rust 2024 crates,
12+
# notably `sha2` 0.11 and `hashbrown` 0.17.
13+
rust-version = "1.85"
1214
default-run = "gix"
1315
include = ["/src/**/*", "/build.rs", "/LICENSE-*", "/README.md"]
1416
resolver = "2"

‎deny.toml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@
1010
[advisories]
1111
ignore = [
1212
{ id = "RUSTSEC-2025-0052", reason = "`async-std` - unmaintained without replacement - needs some time to replace, but async version isn't too important right now" },
13-
{ id = "RUSTSEC-2024-0436", reason = "unmaintained, comes in with `curl`" }
13+
{ id = "RUSTSEC-2024-0436", reason = "unmaintained, comes in with `curl`" },
14+
{ id = "RUSTSEC-2026-0118", reason = "`hickory-proto` comes through reqwest's optional hickory DNS feature; no safe 0.25.x upgrade is available yet" },
15+
{ id = "RUSTSEC-2026-0119", reason = "`hickory-proto` comes through reqwest's optional hickory DNS feature; reqwest has not upgraded to hickory 0.26.1 yet" }
1416
]
1517

1618

‎etc/msrv-badge.svg‎

Lines changed: 4 additions & 4 deletions
Loading

‎examples/log.rs‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use std::{
2-
io::{stdout, Write},
2+
io::{Write, stdout},
33
path::{Path, PathBuf},
44
};
55

@@ -62,16 +62,12 @@ struct Args {
6262

6363
fn run(args: Args) -> anyhow::Result<()> {
6464
let repo = gix::discover(args.git_dir.as_deref().unwrap_or(Path::new(".")))?;
65+
let committish = args.committish.map(|mut c| {
66+
c.push_str("^{commit}");
67+
c
68+
});
6569
let commit = repo
66-
.rev_parse_single({
67-
args.committish
68-
.map(|mut c| {
69-
c.push_str("^{commit}");
70-
c
71-
})
72-
.as_deref()
73-
.unwrap_or("HEAD")
74-
})?
70+
.rev_parse_single(committish.as_deref().unwrap_or("HEAD"))?
7571
.object()?
7672
.try_into_commit()?;
7773

‎examples/ls-tree.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
use std::io::{stdout, Write};
1+
use std::io::{Write, stdout};
22

33
use clap::Parser;
4-
use gix::{bstr::BString, objs::tree::EntryMode, traverse::tree::Recorder, ObjectId};
4+
use gix::{ObjectId, bstr::BString, objs::tree::EntryMode, traverse::tree::Recorder};
55

66
fn main() {
77
let args = Args::parse_from(gix::env::args_os());

‎gitoxide-core/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ repository = "https://github.com/GitoxideLabs/gitoxide"
77
version = "0.57.0"
88
authors = ["Sebastian Thiel <sebastian.thiel@icloud.com>"]
99
license = "MIT OR Apache-2.0"
10-
edition = "2021"
10+
edition = "2024"
1111
include = ["/src/**/*", "/LICENSE-*"]
1212

1313
[lib]

‎gitoxide-core/src/commitgraph/verify.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ pub(crate) mod function {
2424

2525
use crate::OutputFormat;
2626
use anyhow::Result;
27-
use gix::commitgraph::{verify::Outcome, Graph};
27+
use gix::commitgraph::{Graph, verify::Outcome};
2828

2929
pub fn verify<W1, W2>(
3030
path: impl AsRef<Path>,

‎gitoxide-core/src/corpus/db.rs‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
use std::path::{Path, PathBuf};
22

3-
use anyhow::{bail, Context};
3+
use anyhow::{Context, bail};
44
use bytesize::ByteSize;
5-
use rusqlite::{params, OptionalExtension};
5+
use rusqlite::{OptionalExtension, params};
66
use sysinfo::{CpuRefreshKind, RefreshKind};
77

88
use crate::corpus::{Engine, Run};
@@ -65,7 +65,9 @@ pub fn create(path: impl AsRef<std::path::Path>) -> anyhow::Result<rusqlite::Con
6565
}
6666
Some(version) if version != VERSION => match con.close() {
6767
Ok(()) => {
68-
bail!("Cannot handle database with version {version}, cannot yet migrate to {VERSION} - maybe migrate by hand?");
68+
bail!(
69+
"Cannot handle database with version {version}, cannot yet migrate to {VERSION} - maybe migrate by hand?"
70+
);
6971
}
7072
Err((_, err)) => return Err(err.into()),
7173
},

0 commit comments

Comments
 (0)