Skip to content

Commit f8d7c0a

Browse files
Merge pull request #2033 from GitoxideLabs/dependabot/cargo/cargo-b72232998d
2 parents 874cc38 + 91aef25 commit f8d7c0a

File tree

30 files changed

+308
-327
lines changed

30 files changed

+308
-327
lines changed

Cargo.lock

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

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,8 +155,8 @@ gitoxide-core = { version = "^0.47.1", path = "gitoxide-core" }
155155
gix-features = { version = "^0.42.1", path = "gix-features" }
156156
gix = { version = "^0.72.1", path = "gix", default-features = false }
157157

158-
clap = { version = "4.5.37", features = ["derive", "cargo"] }
159-
clap_complete = "4.5.48"
158+
clap = { version = "4.5.39", features = ["derive", "cargo"] }
159+
clap_complete = "4.5.52"
160160
prodash = { version = "29.0.2", optional = true }
161161
is-terminal = { version = "0.4.0", optional = true }
162162
env_logger = { version = "0.11.8", default-features = false }

gitoxide-core/Cargo.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,13 +59,13 @@ serde = { version = "1.0.114", optional = true, default-features = false, featur
5959
anyhow = "1.0.98"
6060
thiserror = "2.0.0"
6161
bytesize = "2.0.1"
62-
tempfile = "3.19.1"
62+
tempfile = "3.20.0"
6363

6464
# for async-client
6565
async-trait = { version = "0.1.51", optional = true }
6666
async-net = { version = "2.0", optional = true }
6767
futures-lite = { version = "2.1.0", optional = true }
68-
async-io = { version = "2.2", optional = true }
68+
async-io = { version = "2.4", optional = true }
6969
futures-io = { version = "0.3.16", optional = true }
7070
blocking = { version = "1.0.2", optional = true }
7171

@@ -79,11 +79,11 @@ crossbeam-channel = { version = "0.5.15", optional = true }
7979
smallvec = { version = "1.15.0", optional = true }
8080

8181
# for 'query' and 'corpus'
82-
rusqlite = { version = "0.35.0", optional = true, features = ["bundled"] }
82+
rusqlite = { version = "0.36.0", optional = true, features = ["bundled"] }
8383

8484
# for 'corpus'
85-
parking_lot = { version = "0.12.1", optional = true }
86-
sysinfo = { version = "0.34.2", optional = true, default-features = false, features = ["system"] }
85+
parking_lot = { version = "0.12.4", optional = true }
86+
sysinfo = { version = "0.35.1", optional = true, default-features = false, features = ["system"] }
8787
serde_json = { version = "1.0.65", optional = true }
8888
tracing-forest = { version = "0.1.5", features = ["serde"], optional = true }
8989
tracing-subscriber = { version = "0.3.17", optional = true }

gix-actor/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ bstr = { version = "1.12.0", default-features = false, features = [
2727
"std",
2828
"unicode",
2929
] }
30-
winnow = { version = "0.7.7", features = ["simd"] }
30+
winnow = { version = "0.7.10", features = ["simd"] }
3131
itoa = "1.0.1"
3232
serde = { version = "1.0.114", optional = true, default-features = false, features = [
3333
"derive",

gix-archive/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ gix-path = { version = "^0.10.18", path = "../gix-path", optional = true }
3434
gix-date = { version = "^0.10.2", path = "../gix-date" }
3535

3636
flate2 = { version = "1.1.1", optional = true, default-features = false, features = ["zlib-rs"] }
37-
zip = { version = "3.0.0", optional = true, default-features = false, features = ["deflate"] }
38-
jiff = { version = "0.2.12", default-features = false, features = ["std"] }
37+
zip = { version = "4.0.0", optional = true, default-features = false, features = ["deflate"] }
38+
jiff = { version = "0.2.14", default-features = false, features = ["std"] }
3939

4040
thiserror = "2.0.0"
4141
bstr = { version = "1.12.0", default-features = false }

gix-config/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ gix-sec = { version = "^0.11.0", path = "../gix-sec" }
2626
gix-ref = { version = "^0.52.1", path = "../gix-ref" }
2727
gix-glob = { version = "^0.20.1", path = "../gix-glob" }
2828

29-
winnow = { version = "0.7.7", features = ["simd"] }
29+
winnow = { version = "0.7.10", features = ["simd"] }
3030
memchr = "2"
3131
thiserror = "2.0.0"
3232
unicode-bom = { version = "2.0.3" }
@@ -38,7 +38,7 @@ once_cell = "1.21.3"
3838
document-features = { version = "0.2.0", optional = true }
3939

4040
[dev-dependencies]
41-
criterion = "0.5.1"
41+
criterion = "0.6.0"
4242

4343
[[bench]]
4444
name = "large_config_file"

gix-config/benches/large_config_file.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
use criterion::{black_box, criterion_group, criterion_main, Criterion};
1+
use criterion::{criterion_group, criterion_main, Criterion};
22
use gix_config::{parse::Events, File};
3+
use std::hint::black_box;
34

45
fn gix_config(c: &mut Criterion) {
56
c.bench_function("GitConfig large config file", |b| {

gix-config/tests/config/file/init/from_paths/includes/conditional/gitdir/util.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ pub fn assert_section_value(
143143
None => None,
144144
},
145145
"gix-config disagrees with the expected value, {} for debugging",
146-
env.tempdir.into_path().display()
146+
env.tempdir.keep().display()
147147
);
148148
assure_git_agrees(expected, env)
149149
}
@@ -173,7 +173,7 @@ fn assure_git_agrees(expected: Option<Value>, env: GitEnv) -> crate::Result {
173173
expected.is_some(),
174174
"{:?}, {} for debugging",
175175
output,
176-
env.tempdir.into_path().display()
176+
env.tempdir.keep().display()
177177
);
178178
let git_output: BString = output.stdout.trim_end().into();
179179
assert_eq!(
@@ -184,7 +184,7 @@ fn assure_git_agrees(expected: Option<Value>, env: GitEnv) -> crate::Result {
184184
None => "",
185185
},
186186
"git disagrees with gix-config, {:?} for debugging",
187-
env.tempdir.into_path()
187+
env.tempdir.keep()
188188
);
189189
Ok(())
190190
}

gix-config/tests/config/file/init/from_paths/includes/conditional/onbranch.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ value = branch-override-by-include
265265
dir,
266266
gix_testtools::tempfile::TempDir::new().expect("substitute can be created"),
267267
);
268-
dir.into_path()
268+
dir.keep()
269269
}
270270
);
271271

@@ -290,7 +290,7 @@ fn assure_git_agrees(expected: Value, dir: &mut gix_testtools::tempfile::TempDir
290290
dir,
291291
gix_testtools::tempfile::TempDir::new().expect("substitute can be created"),
292292
);
293-
dir.into_path()
293+
dir.keep()
294294
};
295295
assert!(
296296
output.status.success(),

gix-date/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ serde = ["dep:serde", "bstr/serde"]
2222
bstr = { version = "1.12.0", default-features = false, features = ["std"] }
2323
serde = { version = "1.0.114", optional = true, default-features = false, features = ["derive"] }
2424
itoa = "1.0.1"
25-
jiff = "0.2.12"
25+
jiff = "0.2.14"
2626
thiserror = "2.0.0"
2727
# TODO: used for quick and easy `TimeBacking: std::io::Write` implementation, but could make that `Copy`
2828
# and remove this dep with custom impl

0 commit comments

Comments
 (0)