Skip to content

Commit e2fc4b4

Browse files
committed
chore(deps): Several version updates
1 parent 7463144 commit e2fc4b4

File tree

7 files changed

+20
-20
lines changed

7 files changed

+20
-20
lines changed

Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ rustic_testing = { path = "crates/testing" }
2222
simplelog = "0.12.2"
2323

2424
# dev-dependencies
25-
rstest = "0.18.2"
25+
rstest = "0.21.0"
2626
tempfile = "3.10.1"
2727

2828
# see: https://nnethercote.github.io/perf-book/build-configuration.html

crates/backend/Cargo.toml

+4-4
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ log = "0.4.21"
5555
bytes = "1.5.0"
5656
derive_setters = "0.1.6"
5757
humantime = "2.1.0"
58-
itertools = "0.12.1"
58+
itertools = "0.13.0"
5959
strum = "0.26"
6060
strum_macros = "0.26"
6161

@@ -75,7 +75,7 @@ walkdir = "2.5.0"
7575

7676
# rest backend
7777
backoff = { version = "0.4.0", optional = true }
78-
reqwest = { version = "0.11.26", default-features = false, features = ["json", "rustls-tls-native-roots", "stream", "blocking"], optional = true }
78+
reqwest = { version = "0.12.5", default-features = false, features = ["json", "rustls-tls-native-roots", "stream", "blocking"], optional = true }
7979

8080
# rclone backend
8181
rand = { version = "0.8.5", optional = true }
@@ -88,11 +88,11 @@ tokio = { version = "1.36.0", optional = true, default-features = false }
8888

8989
[target.'cfg(not(windows))'.dependencies]
9090
# opendal backend - sftp is not supported on windows, see https://github.com/apache/incubator-opendal/issues/2963
91-
opendal = { version = "0.46", features = ["services-b2", "services-sftp", "services-swift", "services-azblob", "services-azdls", "services-cos", "services-fs", "services-gcs", "services-ghac", "services-http", "services-ipmfs", "services-memory", "services-obs", "services-oss", "services-s3", "services-webdav", "services-webhdfs", "services-azfile", "layers-blocking", "layers-throttle"], optional = true }
91+
opendal = { version = "0.48.0", features = ["services-b2", "services-sftp", "services-swift", "services-azblob", "services-azdls", "services-cos", "services-fs", "services-gcs", "services-ghac", "services-http", "services-ipmfs", "services-memory", "services-obs", "services-oss", "services-s3", "services-webdav", "services-webhdfs", "services-azfile", "layers-blocking", "layers-throttle"], optional = true }
9292

9393
[target.'cfg(windows)'.dependencies]
9494
# opendal backend
95-
opendal = { version = "0.46", features = ["services-b2", "services-swift", "services-azblob", "services-azdls", "services-cos", "services-fs", "services-gcs", "services-ghac", "services-http", "services-ipmfs", "services-memory", "services-obs", "services-oss", "services-s3", "services-webdav", "services-webhdfs", "services-azfile", "layers-blocking", "layers-throttle"], optional = true }
95+
opendal = { version = "0.48.0", features = ["services-b2", "services-swift", "services-azblob", "services-azdls", "services-cos", "services-fs", "services-gcs", "services-ghac", "services-http", "services-ipmfs", "services-memory", "services-obs", "services-oss", "services-s3", "services-webdav", "services-webhdfs", "services-azfile", "layers-blocking", "layers-throttle"], optional = true }
9696

9797
[dev-dependencies]
9898
rstest = { workspace = true }

crates/backend/src/opendal.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ impl OpenDALBackend {
9191
.transpose()?;
9292

9393
let schema = Scheme::from_str(path.as_ref())?;
94-
let mut operator = Operator::via_map(schema, options)?
94+
let mut operator = Operator::via_iter(schema, options)?
9595
.layer(RetryLayer::new().with_max_times(max_retries).with_jitter());
9696

9797
if let Some(Throttle { bandwidth, burst }) = throttle {

crates/core/Cargo.toml

+10-10
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ rand = "0.8.5"
6969
scrypt = { version = "0.11.0", default-features = false }
7070

7171
# serialization / packing
72-
binrw = "0.13.3"
72+
binrw = "0.14.0"
7373
hex = { version = "0.4.3", features = ["serde"] }
7474
integer-sqrt = "0.1.5"
7575
serde = { version = "1.0.197" }
@@ -79,11 +79,11 @@ serde_json = "1.0.114"
7979
serde_with = { version = "3.7.0", features = ["base64"] }
8080

8181
# local source/destination
82-
cached = { version = "0.49.2", default-features = false, features = ["proc_macro"] }
82+
cached = { version = "0.53.1", default-features = false, features = ["proc_macro"] }
8383
dunce = "1.0.4"
8484
filetime = "0.2.23"
8585
ignore = "0.4.22"
86-
nix = { version = "0.28", default-features = false, features = ["user", "fs"] }
86+
nix = { version = "0.29.0", default-features = false, features = ["user", "fs"] }
8787
path-dedot = "3.1.1"
8888
walkdir = "2.5.0"
8989

@@ -96,8 +96,8 @@ clap = { version = "4.5.2", optional = true, features = ["derive", "env", "wrap_
9696
merge = { version = "0.1.0", optional = true }
9797

9898
# vfs support
99-
dav-server = { version = "0.5.8", default-features = false, optional = true }
100-
futures = { version = "0.3", optional = true }
99+
dav-server = { version = "0.7.0", default-features = false, optional = true }
100+
futures = { version = "0.3.30", optional = true }
101101
runtime-format = "0.1.3"
102102

103103
# other dependencies
@@ -110,18 +110,18 @@ enum-map-derive = "0.17.0"
110110
enumset = { version = "1.1.3", features = ["serde"] }
111111
gethostname = "0.4.3"
112112
humantime = "2.1.0"
113-
itertools = "0.12.1"
114-
quick_cache = "0.4.1"
113+
itertools = "0.13.0"
114+
quick_cache = "0.6.2"
115115
strum = { version = "0.26.2", features = ["derive"] }
116116
zstd = "0.13.0"
117117

118118
[target.'cfg(not(windows))'.dependencies]
119-
sha2 = { version = "0.10", features = ["asm"] }
119+
sha2 = { version = "0.10.8", features = ["asm"] }
120120

121121
[target.'cfg(windows)'.dependencies]
122122
# unfortunately, the asm extensions do not build on Windows, see https://github.com/RustCrypto/asm-hashes/issues/17
123123
# and https://github.com/RustCrypto/asm-hashes/pull/issues/78
124-
sha2 = "0.10"
124+
sha2 = "0.10.8"
125125

126126
[target.'cfg(not(any(windows, target_os="openbsd")))'.dependencies]
127127
# for local source/destination
@@ -132,7 +132,7 @@ expect-test = "1.4.1"
132132
flate2 = "1.0.28"
133133
globset = "0.4.14"
134134
insta = { version = "1.36.1", features = ["redactions", "ron"] }
135-
mockall = "0.12.1"
135+
mockall = "0.13"
136136
pretty_assertions = "1.4.0"
137137
quickcheck = "1.0.3"
138138
quickcheck_macros = "1.0.0"

crates/core/src/commands/restore.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -508,7 +508,7 @@ fn restore_contents<P: ProgressBars, S: Open>(
508508
};
509509

510510
// save into needed files in parallel
511-
for (bl, group) in &name_dests.into_iter().group_by(|item| item.0.clone()) {
511+
for (bl, group) in &name_dests.into_iter().chunk_by(|item| item.0.clone()) {
512512
let size = bl.data_length();
513513
let data = if from_file.is_some() {
514514
read_data.clone()

crates/core/src/repofile/snapshotfile.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -641,7 +641,7 @@ impl SnapshotFile {
641641
let mut result = Vec::new();
642642
for (group, snaps) in &snaps
643643
.into_iter()
644-
.group_by(|sn| SnapshotGroup::from_snapshot(sn, crit))
644+
.chunk_by(|sn| SnapshotGroup::from_snapshot(sn, crit))
645645
{
646646
result.push((group, snaps.collect()));
647647
}

crates/core/src/repository.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1288,9 +1288,9 @@ impl<P, S: IndexedTree> IndexedTree for Repository<P, S> {
12881288
pub(crate) struct BytesWeighter;
12891289

12901290
impl quick_cache::Weighter<Id, Bytes> for BytesWeighter {
1291-
fn weight(&self, _key: &Id, val: &Bytes) -> u32 {
1291+
fn weight(&self, _key: &Id, val: &Bytes) -> u64 {
12921292
// Be cautions out about zero weights!
1293-
u32::try_from(val.len().clamp(1, u32::MAX as usize))
1293+
u64::try_from(val.len().clamp(1, u64::MAX as usize))
12941294
.expect("weight overflow in cache should not happen")
12951295
}
12961296
}

0 commit comments

Comments
 (0)