Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(deps): Several version updates #234

Merged
merged 2 commits into from
Aug 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ rustic_testing = { path = "crates/testing" }
simplelog = "0.12.2"

# dev-dependencies
rstest = "0.18.2"
rstest = "0.21.0"
tempfile = "3.10.1"

# see: https://nnethercote.github.io/perf-book/build-configuration.html
Expand Down
8 changes: 4 additions & 4 deletions crates/backend/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ log = "0.4.21"
bytes = "1.5.0"
derive_setters = "0.1.6"
humantime = "2.1.0"
itertools = "0.12.1"
itertools = "0.13.0"
strum = "0.26"
strum_macros = "0.26"

Expand All @@ -75,7 +75,7 @@ walkdir = "2.5.0"

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

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

[target.'cfg(not(windows))'.dependencies]
# opendal backend - sftp is not supported on windows, see https://github.com/apache/incubator-opendal/issues/2963
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 }
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 }

[target.'cfg(windows)'.dependencies]
# opendal backend
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 }
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 }

[dev-dependencies]
rstest = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion crates/backend/src/opendal.rs
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ impl OpenDALBackend {
.transpose()?;

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

if let Some(Throttle { bandwidth, burst }) = throttle {
Expand Down
20 changes: 10 additions & 10 deletions crates/core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ rand = "0.8.5"
scrypt = { version = "0.11.0", default-features = false }

# serialization / packing
binrw = "0.13.3"
binrw = "0.14.0"
hex = { version = "0.4.3", features = ["serde"] }
integer-sqrt = "0.1.5"
serde = { version = "1.0.197" }
Expand All @@ -79,11 +79,11 @@ serde_json = "1.0.114"
serde_with = { version = "3.7.0", features = ["base64"] }

# local source/destination
cached = { version = "0.49.2", default-features = false, features = ["proc_macro"] }
cached = { version = "0.53.1", default-features = false, features = ["proc_macro"] }
dunce = "1.0.4"
filetime = "0.2.23"
ignore = "0.4.22"
nix = { version = "0.28", default-features = false, features = ["user", "fs"] }
nix = { version = "0.29.0", default-features = false, features = ["user", "fs"] }
path-dedot = "3.1.1"
walkdir = "2.5.0"

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

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

# other dependencies
Expand All @@ -110,18 +110,18 @@ enum-map-derive = "0.17.0"
enumset = { version = "1.1.3", features = ["serde"] }
gethostname = "0.4.3"
humantime = "2.1.0"
itertools = "0.12.1"
quick_cache = "0.4.1"
itertools = "0.13.0"
quick_cache = "0.6.2"
strum = { version = "0.26.2", features = ["derive"] }
zstd = "0.13.0"

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

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

[target.'cfg(not(any(windows, target_os="openbsd")))'.dependencies]
# for local source/destination
Expand All @@ -132,7 +132,7 @@ expect-test = "1.4.1"
flate2 = "1.0.28"
globset = "0.4.14"
insta = { version = "1.36.1", features = ["redactions", "ron"] }
mockall = "0.12.1"
mockall = "0.13"
pretty_assertions = "1.4.0"
quickcheck = "1.0.3"
quickcheck_macros = "1.0.0"
Expand Down
2 changes: 1 addition & 1 deletion crates/core/src/commands/restore.rs
Original file line number Diff line number Diff line change
Expand Up @@ -508,7 +508,7 @@
};

// save into needed files in parallel
for (bl, group) in &name_dests.into_iter().group_by(|item| item.0.clone()) {
for (bl, group) in &name_dests.into_iter().chunk_by(|item| item.0.clone()) {

Check warning on line 511 in crates/core/src/commands/restore.rs

View check run for this annotation

Codecov / codecov/patch

crates/core/src/commands/restore.rs#L511

Added line #L511 was not covered by tests
let size = bl.data_length();
let data = if from_file.is_some() {
read_data.clone()
Expand Down
2 changes: 1 addition & 1 deletion crates/core/src/repofile/snapshotfile.rs
Original file line number Diff line number Diff line change
Expand Up @@ -641,7 +641,7 @@
let mut result = Vec::new();
for (group, snaps) in &snaps
.into_iter()
.group_by(|sn| SnapshotGroup::from_snapshot(sn, crit))
.chunk_by(|sn| SnapshotGroup::from_snapshot(sn, crit))

Check warning on line 644 in crates/core/src/repofile/snapshotfile.rs

View check run for this annotation

Codecov / codecov/patch

crates/core/src/repofile/snapshotfile.rs#L644

Added line #L644 was not covered by tests
{
result.push((group, snaps.collect()));
}
Expand Down
7 changes: 4 additions & 3 deletions crates/core/src/repository.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1288,10 +1288,11 @@ impl<P, S: IndexedTree> IndexedTree for Repository<P, S> {
pub(crate) struct BytesWeighter;

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

Expand Down
2 changes: 1 addition & 1 deletion crates/core/src/vfs/webdavfs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@
let entries = self.dir_entries_from_path(davpath)?;
let entry_iter = entries.into_iter().map(|e| {
let entry: Box<dyn DavDirEntry> = Box::new(DavFsDirEntry(e));
entry
Ok(entry)

Check warning on line 157 in crates/core/src/vfs/webdavfs.rs

View check run for this annotation

Codecov / codecov/patch

crates/core/src/vfs/webdavfs.rs#L157

Added line #L157 was not covered by tests
});
let strm: FsStream<Box<dyn DavDirEntry>> = Box::pin(futures::stream::iter(entry_iter));
Ok(strm)
Expand Down
Loading