Skip to content

Commit

Permalink
build(deps): bump the deps group with 4 updates (#1542)
Browse files Browse the repository at this point in the history
* build(deps): bump the deps group with 4 updates

Bumps the deps group with 4 updates: [thiserror](https://github.com/dtolnay/thiserror), [async_zip](https://github.com/Majored/rs-async-zip), [futures-util](https://github.com/rust-lang/futures-rs) and [syn](https://github.com/dtolnay/syn).


Updates `thiserror` from 1.0.51 to 1.0.52
- [Release notes](https://github.com/dtolnay/thiserror/releases)
- [Commits](dtolnay/thiserror@1.0.51...1.0.52)

Updates `async_zip` from 0.0.15 to 0.0.16
- [Release notes](https://github.com/Majored/rs-async-zip/releases)
- [Commits](https://github.com/Majored/rs-async-zip/commits/v0.0.16)

Updates `futures-util` from 0.3.29 to 0.3.30
- [Release notes](https://github.com/rust-lang/futures-rs/releases)
- [Changelog](https://github.com/rust-lang/futures-rs/blob/master/CHANGELOG.md)
- [Commits](rust-lang/futures-rs@0.3.29...0.3.30)

Updates `syn` from 2.0.42 to 2.0.43
- [Release notes](https://github.com/dtolnay/syn/releases)
- [Commits](dtolnay/syn@2.0.42...2.0.43)

---
updated-dependencies:
- dependency-name: thiserror
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: deps
- dependency-name: async_zip
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: deps
- dependency-name: futures-util
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: deps
- dependency-name: syn
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: deps
...

Signed-off-by: dependabot[bot] <[email protected]>

* Fix compilation of `extract_zip_entry`: Relax generic bound

Use `futures_io::AsyncRead`, which is the most relaxed bound possible.

Signed-off-by: Jiahao XU <[email protected]>

* ENable feature `async_zip/deflate64`

New compression algorithm introduced

Signed-off-by: Jiahao XU <[email protected]>

* Update transitive deps

Signed-off-by: Jiahao XU <[email protected]>

---------

Signed-off-by: dependabot[bot] <[email protected]>
Signed-off-by: Jiahao XU <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jiahao XU <[email protected]>
  • Loading branch information
dependabot[bot] and NobodyXu authored Dec 26, 2023
1 parent 55bb7f3 commit 2c23023
Show file tree
Hide file tree
Showing 12 changed files with 111 additions and 130 deletions.
209 changes: 95 additions & 114 deletions Cargo.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion crates/binstalk-bins/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ compact_str = { version = "0.7.0", features = ["serde"] }
leon = { version = "2.0.1", path = "../leon" }
miette = "5.9.0"
normalize-path = { version = "0.2.1", path = "../normalize-path" }
thiserror = "1.0.51"
thiserror = "1.0.52"
tracing = "0.1.39"
7 changes: 4 additions & 3 deletions crates/binstalk-downloader/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,14 @@ license = "Apache-2.0 OR MIT"
[dependencies]
async-trait = "0.1.68"
async-compression = { version = "0.4.4", features = ["gzip", "zstd", "xz", "bzip2", "tokio"] }
async_zip = { version = "0.0.15", features = ["deflate", "bzip2", "lzma", "zstd", "xz", "tokio"] }
async_zip = { version = "0.0.16", features = ["deflate", "deflate64", "bzip2", "lzma", "zstd", "xz", "tokio"] }
binstalk-types = { version = "0.6.1", path = "../binstalk-types" }
bytes = "1.4.0"
bzip2 = "0.4.4"
compact_str = "0.7.0"
flate2 = { version = "1.0.28", default-features = false }
futures-util = "0.3.28"
futures-util = "0.3.30"
futures-io = "0.3.30"
httpdate = "1.0.2"
reqwest = { version = "0.11.19", features = ["stream", "gzip", "brotli", "deflate"], default-features = false }
percent-encoding = "2.2.0"
Expand All @@ -31,7 +32,7 @@ serde_json = { version = "1.0.107", optional = true }
#tar = "0.4.38"
tar = { package = "binstall-tar", version = "0.4.39" }
tempfile = "3.5.0"
thiserror = "1.0.51"
thiserror = "1.0.52"
tokio = { version = "1.35.0", features = ["macros", "rt-multi-thread", "sync", "time", "fs"], default-features = false }
tokio-tar = "0.3.0"
tokio-util = { version = "0.7.8", features = ["io"] }
Expand Down
7 changes: 3 additions & 4 deletions crates/binstalk-downloader/src/download/zip_extraction.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,12 @@ use async_zip::{
};
use bytes::{Bytes, BytesMut};
use futures_util::future::try_join;
use futures_util::io::Take;
use thiserror::Error as ThisError;
use tokio::{
io::{AsyncRead, AsyncReadExt},
sync::mpsc,
};
use tokio_util::compat::{Compat, FuturesAsyncReadCompatExt};
use tokio_util::compat::FuturesAsyncReadCompatExt;

use super::{DownloadError, ExtractedFiles};
use crate::utils::asyncify;
Expand All @@ -41,13 +40,13 @@ impl ZipError {
}

pub(super) async fn extract_zip_entry<R>(
zip_reader: &mut ZipEntryReader<'_, Take<Compat<R>>, WithEntry<'_>>,
zip_reader: &mut ZipEntryReader<'_, R, WithEntry<'_>>,
path: &Path,
buf: &mut BytesMut,
extracted_files: &mut ExtractedFiles,
) -> Result<(), DownloadError>
where
R: AsyncRead + Unpin + Send + Sync,
R: futures_io::AsyncRead + Unpin + Send + Sync,
{
// Sanitize filename
let raw_filename = zip_reader.entry().filename();
Expand Down
2 changes: 1 addition & 1 deletion crates/binstalk-fetchers/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ miette = "5.9.0"
minisign-verify = "0.2.1"
once_cell = "1.18.0"
strum = "0.25.0"
thiserror = "1.0.51"
thiserror = "1.0.52"
tokio = { version = "1.35.0", features = ["rt", "sync"], default-features = false }
tracing = "0.1.39"
url = "2.3.1"
Expand Down
2 changes: 1 addition & 1 deletion crates/binstalk-manifests/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ semver = { version = "1.0.17", features = ["serde"] }
serde = { version = "1.0.163", features = ["derive"] }
serde-tuple-vec-map = "1.0.1"
serde_json = "1.0.107"
thiserror = "1.0.51"
thiserror = "1.0.52"
toml_edit = { version = "0.21.0", features = ["serde"] }
url = { version = "2.3.1", features = ["serde"] }

Expand Down
2 changes: 1 addition & 1 deletion crates/binstalk-registry/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ serde_json = "1.0.107"
sha2 = "0.10.7"
simple-git = { version = "0.2.0", path = "../simple-git", optional = true }
tempfile = "3.5.0"
thiserror = "1.0.51"
thiserror = "1.0.52"
tokio = { version = "1.35.0", features = ["rt", "sync"], default-features = false }
tracing = "0.1.39"
url = "2.3.1"
Expand Down
2 changes: 1 addition & 1 deletion crates/binstalk/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ simple-git = { version = "0.2.0", path = "../simple-git", optional = true }
strum = "0.25.0"
target-lexicon = { version = "0.12.11", features = ["std"] }
tempfile = "3.5.0"
thiserror = "1.0.51"
thiserror = "1.0.52"
tokio = { version = "1.35.0", features = ["rt", "process", "sync"], default-features = false }
tracing = "0.1.39"
url = { version = "2.3.1", features = ["serde"] }
Expand Down
2 changes: 1 addition & 1 deletion crates/cargo-toml-workspace/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ compact_str = { version = "0.7.0", features = ["serde"] }
glob = "0.3.1"
normalize-path = { version = "0.2.1", path = "../normalize-path" }
serde = "1.0.163"
thiserror = "1.0.51"
thiserror = "1.0.52"
tracing = "0.1.39"

[dev-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion crates/leon-macros/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ proc-macro = true
[dependencies]
leon = { version = "2.0.1", path = "../leon", default-features = false }
proc-macro2 = "1.0.68"
syn = { version = "2.0.35", default-features = false, features = ["proc-macro", "parsing"] }
syn = { version = "2.0.43", default-features = false, features = ["proc-macro", "parsing"] }
quote = "1.0.28"
2 changes: 1 addition & 1 deletion crates/leon/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ exclude = ["fuzz", "benches"]
[dependencies]
clap = { version = "4.4.8", features = ["derive"], optional = true }
miette = { version = "5.9.0", default-features = false, optional = true }
thiserror = "1.0.51"
thiserror = "1.0.52"

[features]
default = ["miette"]
Expand Down
2 changes: 1 addition & 1 deletion crates/simple-git/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ license = "Apache-2.0 OR MIT"
[dependencies]
compact_str = "0.7.0"
derive_destructure2 = "0.1"
thiserror = "1.0.51"
thiserror = "1.0.52"
tokio = { version = "1.35.0", features = ["rt", "time"], default-features = false }
tracing = "0.1.39"

Expand Down

0 comments on commit 2c23023

Please sign in to comment.