build(deps): bump the deps group with 3 updates (#2072)
Some checks failed
Release-plz / Release-plz (push) Has been cancelled

* build(deps): bump the deps group with 3 updates

Bumps the deps group with 3 updates: [compact_str](https://github.com/ParkMyCar/compact_str), [bzip2](https://github.com/trifectatechfoundation/bzip2-rs) and [fs4](https://github.com/al8n/fs4-rs).


Updates `compact_str` from 0.8.1 to 0.9.0
- [Changelog](https://github.com/ParkMyCar/compact_str/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ParkMyCar/compact_str/compare/v0.8.1...v0.9.0)

Updates `bzip2` from 0.5.1 to 0.5.2
- [Release notes](https://github.com/trifectatechfoundation/bzip2-rs/releases)
- [Commits](https://github.com/trifectatechfoundation/bzip2-rs/compare/v0.5.1...v0.5.2)

Updates `fs4` from 0.12.0 to 0.13.0
- [Release notes](https://github.com/al8n/fs4-rs/releases)
- [Changelog](https://github.com/al8n/fs4-rs/blob/main/CHANGELOG.md)
- [Commits](https://github.com/al8n/fs4-rs/commits)

---
updated-dependencies:
- dependency-name: compact_str
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: deps
- dependency-name: bzip2
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: deps
- dependency-name: fs4
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: deps
...

Signed-off-by: dependabot[bot] <support@github.com>

* Fix use of fs4::fs_std::FileExt::try_lock*

Signed-off-by: Jiahao XU <30436523+NobodyXu@users.noreply.github.com>

---------

Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: Jiahao XU <30436523+NobodyXu@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jiahao XU <30436523+NobodyXu@users.noreply.github.com>
This commit is contained in:
dependabot[bot] 2025-03-01 18:11:06 +11:00 committed by GitHub
parent 7c38109b23
commit d9da8aaba4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
13 changed files with 35 additions and 50 deletions

57
Cargo.lock generated
View file

@ -140,7 +140,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "06575e6a9673580f52661c92107baabffbf41e2141373441cbcdc47cb733003c"
dependencies = [
"brotli",
"bzip2 0.5.1",
"bzip2 0.5.2",
"flate2",
"futures-core",
"memchr",
@ -252,7 +252,7 @@ dependencies = [
"binstalk-types",
"cargo-toml-workspace",
"command-group",
"compact_str 0.8.1",
"compact_str",
"detect-targets",
"either",
"itertools",
@ -278,7 +278,7 @@ version = "0.6.11"
dependencies = [
"atomic-file-install",
"binstalk-types",
"compact_str 0.8.1",
"compact_str",
"leon",
"miette",
"normalize-path",
@ -295,9 +295,9 @@ dependencies = [
"binstalk-types",
"binstall-tar",
"bytes",
"bzip2 0.5.1",
"bzip2 0.5.2",
"cfg-if",
"compact_str 0.8.1",
"compact_str",
"default-net",
"flate2",
"futures-io",
@ -331,7 +331,7 @@ dependencies = [
"binstalk-git-repo-api",
"binstalk-types",
"bytes",
"compact_str 0.8.1",
"compact_str",
"either",
"itertools",
"leon",
@ -351,7 +351,7 @@ name = "binstalk-git-repo-api"
version = "0.5.15"
dependencies = [
"binstalk-downloader",
"compact_str 0.8.1",
"compact_str",
"once_cell",
"percent-encoding",
"serde",
@ -371,7 +371,7 @@ version = "0.15.24"
dependencies = [
"beef",
"binstalk-types",
"compact_str 0.8.1",
"compact_str",
"detect-targets",
"fs-lock",
"home",
@ -395,7 +395,7 @@ dependencies = [
"binstalk-downloader",
"binstalk-types",
"cargo-toml-workspace",
"compact_str 0.8.1",
"compact_str",
"leon",
"miette",
"normalize-path",
@ -417,7 +417,7 @@ dependencies = [
name = "binstalk-types"
version = "0.9.3"
dependencies = [
"compact_str 0.8.1",
"compact_str",
"maybe-owned",
"once_cell",
"semver",
@ -528,21 +528,20 @@ dependencies = [
[[package]]
name = "bzip2"
version = "0.5.1"
version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "75b89e7c29231c673a61a46e722602bcd138298f6b9e81e71119693534585f5c"
checksum = "49ecfb22d906f800d4fe833b6282cf4dc1c298f5057ca0b5445e5c209735ca47"
dependencies = [
"bzip2-sys",
]
[[package]]
name = "bzip2-sys"
version = "0.1.12+1.0.8"
version = "0.1.13+1.0.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "72ebc2f1a417f01e1da30ef264ee86ae31d2dcd2d603ea283d3c244a883ca2a9"
checksum = "225bff33b2141874fe80d71e07d6eec4f85c5c216453dd96388240f96e1acc14"
dependencies = [
"cc",
"libc",
"pkg-config",
]
@ -564,7 +563,7 @@ dependencies = [
"binstalk-manifests",
"clap",
"clap-cargo",
"compact_str 0.8.1",
"compact_str",
"dirs",
"embed-resource",
"file-format",
@ -601,7 +600,7 @@ name = "cargo-toml-workspace"
version = "7.0.4"
dependencies = [
"cargo_toml",
"compact_str 0.8.1",
"compact_str",
"glob",
"normalize-path",
"serde",
@ -770,21 +769,6 @@ dependencies = [
"winapi",
]
[[package]]
name = "compact_str"
version = "0.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3b79c4069c6cad78e2e0cdfcbd26275770669fb39fd308a752dc110e83b9af32"
dependencies = [
"castaway",
"cfg-if",
"itoa",
"rustversion",
"ryu",
"serde",
"static_assertions",
]
[[package]]
name = "compact_str"
version = "0.9.0"
@ -796,6 +780,7 @@ dependencies = [
"itoa",
"rustversion",
"ryu",
"serde",
"static_assertions",
]
@ -1182,12 +1167,12 @@ dependencies = [
[[package]]
name = "fs4"
version = "0.12.0"
version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c29c30684418547d476f0b48e84f4821639119c483b1eccd566c8cd0cd05f521"
checksum = "be058769cf1633370c3d0dac6bb9b223b8f18900cf808abadf7843192e706238"
dependencies = [
"rustix",
"windows-sys 0.52.0",
"windows-sys 0.59.0",
]
[[package]]
@ -4059,7 +4044,7 @@ version = "0.2.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c73b7cfffb1daffacab7bbb42f02b6c5d9117957edad4c58c6aa83bea187ec84"
dependencies = [
"compact_str 0.9.0",
"compact_str",
"derive_destructure2",
"gix",
"thiserror 1.0.69",

View file

@ -27,7 +27,7 @@ binstalk = { path = "../binstalk", version = "0.28.27", default-features = false
binstalk-manifests = { path = "../binstalk-manifests", version = "0.15.24" }
clap = { version = "4.5.3", features = ["derive", "env", "wrap_help"] }
clap-cargo = "0.15.2"
compact_str = "0.8.0"
compact_str = "0.9.0"
dirs = "6.0.0"
file-format = { version = "0.26.0", default-features = false }
home = "0.5.9"

View file

@ -13,7 +13,7 @@ license = "GPL-3.0-only"
[dependencies]
atomic-file-install = { version = "1.0.10", path = "../atomic-file-install" }
binstalk-types = { version = "0.9.3", path = "../binstalk-types" }
compact_str = { version = "0.8.0", features = ["serde"] }
compact_str = { version = "0.9.0", features = ["serde"] }
leon = "3.0.0"
miette = "7.0.0"
normalize-path = { version = "0.2.1", path = "../normalize-path" }

View file

@ -20,9 +20,9 @@ async-compression = { version = "0.4.4", features = [
] }
binstalk-types = { version = "0.9.3", path = "../binstalk-types" }
bytes = "1.4.0"
bzip2 = "0.5.0"
bzip2 = "0.5.2"
cfg-if = "1"
compact_str = "0.8.0"
compact_str = "0.9.0"
flate2 = { version = "1.0.28", default-features = false }
futures-util = "0.3.30"
futures-io = "0.3.30"

View file

@ -16,7 +16,7 @@ binstalk-downloader = { version = "0.13.13", path = "../binstalk-downloader", de
binstalk-git-repo-api = { version = "0.5.15", path = "../binstalk-git-repo-api" }
binstalk-types = { version = "0.9.3", path = "../binstalk-types" }
bytes = "1.4.0"
compact_str = { version = "0.8.0" }
compact_str = { version = "0.9.0" }
either = "1.11.0"
itertools = "0.14.0"
leon = "3.0.0"

View file

@ -13,7 +13,7 @@ license = "Apache-2.0 OR MIT"
binstalk-downloader = { version = "0.13.13", path = "../binstalk-downloader", default-features = false, features = [
"json",
] }
compact_str = "0.8.0"
compact_str = "0.9.0"
percent-encoding = "2.2.0"
serde = { version = "1.0.163", features = ["derive"] }
serde-tuple-vec-map = "1.0.1"

View file

@ -12,7 +12,7 @@ license = "Apache-2.0 OR MIT"
[dependencies]
beef = { version = "0.5.2", features = ["impl_serde"] }
binstalk-types = { version = "0.9.3", path = "../binstalk-types" }
compact_str = { version = "0.8.0", features = ["serde"] }
compact_str = { version = "0.9.0", features = ["serde"] }
fs-lock = { version = "0.1.8", path = "../fs-lock", features = ["tracing"] }
home = "0.5.9"
miette = "7.0.0"

View file

@ -18,7 +18,7 @@ binstalk-downloader = { version = "0.13.13", path = "../binstalk-downloader", de
] }
binstalk-types = { version = "0.9.3", path = "../binstalk-types" }
cargo-toml-workspace = { version = "7.0.4", path = "../cargo-toml-workspace" }
compact_str = { version = "0.8.0", features = ["serde"] }
compact_str = { version = "0.9.0", features = ["serde"] }
leon = "3.0.0"
miette = "7.0.0"
normalize-path = { version = "0.2.1", path = "../normalize-path" }

View file

@ -10,7 +10,7 @@ edition = "2021"
license = "Apache-2.0 OR MIT"
[dependencies]
compact_str = { version = "0.8.0", features = ["serde"] }
compact_str = { version = "0.9.0", features = ["serde"] }
maybe-owned = { version = "0.3.4", features = ["serde"] }
once_cell = "1.18.0"
semver = { version = "1.0.17", features = ["serde"] }

View file

@ -20,7 +20,7 @@ binstalk-registry = { version = "0.11.14", path = "../binstalk-registry" }
binstalk-types = { version = "0.9.3", path = "../binstalk-types" }
cargo-toml-workspace = { version = "7.0.4", path = "../cargo-toml-workspace" }
command-group = { version = "5.0.1", features = ["with-tokio"] }
compact_str = { version = "0.8.0", features = ["serde"] }
compact_str = { version = "0.9.0", features = ["serde"] }
detect-targets = { version = "0.1.43", path = "../detect-targets", features = [
"tracing",
] }

View file

@ -11,7 +11,7 @@ license = "Apache-2.0 OR MIT"
[dependencies]
cargo_toml = "0.21.0"
compact_str = { version = "0.8.0", features = ["serde"] }
compact_str = { version = "0.9.0", features = ["serde"] }
glob = "0.3.1"
normalize-path = { version = "0.2.1", path = "../normalize-path" }
serde = "1.0.163"

View file

@ -10,5 +10,5 @@ edition = "2021"
license = "Apache-2.0 OR MIT"
[dependencies]
fs4 = "0.12.0"
fs4 = "0.13.0"
tracing = { version = "0.1", optional = true }

View file

@ -44,7 +44,7 @@ impl FileLock {
/// Note that this operation is blocking, and should not be called in async contexts.
pub fn new_try_exclusive(file: File) -> Result<Self, (File, Option<io::Error>)> {
match FileExt::try_lock_exclusive(&file) {
Ok(()) => Ok(Self::new(file)),
Ok(_) => Ok(Self::new(file)),
Err(e) if e.raw_os_error() == fs4::lock_contended_error().raw_os_error() => {
Err((file, None))
}
@ -70,7 +70,7 @@ impl FileLock {
/// Note that this operation is blocking, and should not be called in async contexts.
pub fn new_try_shared(file: File) -> Result<Self, (File, Option<io::Error>)> {
match FileExt::try_lock_shared(&file) {
Ok(()) => Ok(Self::new(file)),
Ok(_) => Ok(Self::new(file)),
Err(e) if e.raw_os_error() == fs4::lock_contended_error().raw_os_error() => {
Err((file, None))
}