From 9cd898b885dc0bf61d5e50861eb982c9a8c73fd5 Mon Sep 17 00:00:00 2001 From: Niyaz Nigmatullin Date: Tue, 16 Aug 2022 15:37:58 +0300 Subject: [PATCH] remove nix 0.24.2 dependency --- Cargo.lock | 42 ++++++++++++++++++--------------------- Cargo.toml | 2 +- src/uu/cat/Cargo.toml | 2 +- src/uu/kill/Cargo.toml | 2 +- src/uu/more/Cargo.toml | 2 +- src/uu/nice/Cargo.toml | 2 +- src/uu/tail/Cargo.toml | 2 +- src/uu/timeout/Cargo.toml | 2 +- src/uu/wc/Cargo.toml | 2 +- src/uu/yes/Cargo.toml | 2 +- src/uucore/Cargo.toml | 2 +- 11 files changed, 29 insertions(+), 33 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1ff2d07b4..ba035a72c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -351,7 +351,7 @@ dependencies = [ "glob", "hex-literal", "libc", - "nix 0.24.2", + "nix", "once_cell", "phf", "phf_codegen", @@ -690,7 +690,7 @@ version = "3.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d91974fbbe88ec1df0c24a4f00f99583667a7e2e6272b2b92d294d81e462173" dependencies = [ - "nix 0.25.0", + "nix", "winapi 0.3.9", ] @@ -1214,18 +1214,6 @@ dependencies = [ "windows-sys", ] -[[package]] -name = "nix" -version = "0.24.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "195cdbc1741b8134346d515b3a56a1c94b0912758009cfd53f99ea0f57b065fc" -dependencies = [ - "bitflags", - "cfg-if 1.0.0", - "libc", - "memoffset", -] - [[package]] name = "nix" version = "0.25.0" @@ -1236,6 +1224,8 @@ dependencies = [ "bitflags", "cfg-if 1.0.0", "libc", + "memoffset", + "pin-utils", ] [[package]] @@ -1485,6 +1475,12 @@ dependencies = [ "siphasher", ] +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + [[package]] name = "pkg-config" version = "0.3.25" @@ -2191,7 +2187,7 @@ version = "0.0.14" dependencies = [ "atty", "clap 3.2.17", - "nix 0.24.2", + "nix", "thiserror", "unix_socket", "uucore", @@ -2530,7 +2526,7 @@ name = "uu_kill" version = "0.0.14" dependencies = [ "clap 3.2.17", - "nix 0.24.2", + "nix", "uucore", ] @@ -2620,7 +2616,7 @@ dependencies = [ "atty", "clap 3.2.17", "crossterm", - "nix 0.24.2", + "nix", "unicode-segmentation", "unicode-width", "uucore", @@ -2641,7 +2637,7 @@ version = "0.0.14" dependencies = [ "clap 3.2.17", "libc", - "nix 0.24.2", + "nix", "uucore", ] @@ -2947,7 +2943,7 @@ version = "0.0.14" dependencies = [ "clap 3.2.17", "libc", - "nix 0.24.2", + "nix", "notify", "uucore", "winapi 0.3.9", @@ -2980,7 +2976,7 @@ version = "0.0.14" dependencies = [ "clap 3.2.17", "libc", - "nix 0.24.2", + "nix", "uucore", ] @@ -3108,7 +3104,7 @@ dependencies = [ "bytecount", "clap 3.2.17", "libc", - "nix 0.24.2", + "nix", "unicode-width", "utf-8", "uucore", @@ -3138,7 +3134,7 @@ version = "0.0.14" dependencies = [ "clap 3.2.17", "libc", - "nix 0.24.2", + "nix", "uucore", ] @@ -3154,7 +3150,7 @@ dependencies = [ "glob", "itertools", "libc", - "nix 0.24.2", + "nix", "once_cell", "os_display", "thiserror", diff --git a/Cargo.toml b/Cargo.toml index 9c540531c..134f73925 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -402,7 +402,7 @@ hex-literal = "0.3.1" rlimit = "0.8.3" [target.'cfg(unix)'.dev-dependencies] -nix = { version = "0.24.2", default-features = false, features = ["process", "signal", "user"] } +nix = { version = "0.25", default-features = false, features = ["process", "signal", "user"] } rust-users = { version="0.11", package="users" } unix_socket = "0.5.0" diff --git a/src/uu/cat/Cargo.toml b/src/uu/cat/Cargo.toml index 4d4793b94..36265d380 100644 --- a/src/uu/cat/Cargo.toml +++ b/src/uu/cat/Cargo.toml @@ -22,7 +22,7 @@ uucore = { version=">=0.0.11", package="uucore", path="../../uucore", features=[ [target.'cfg(unix)'.dependencies] unix_socket = "0.5.0" -nix = { version = "0.24.2", default-features = false } +nix = { version = "0.25", default-features = false } [[bin]] name = "cat" diff --git a/src/uu/kill/Cargo.toml b/src/uu/kill/Cargo.toml index 3632f2cf7..8a5713a49 100644 --- a/src/uu/kill/Cargo.toml +++ b/src/uu/kill/Cargo.toml @@ -16,7 +16,7 @@ path = "src/kill.rs" [dependencies] clap = { version = "3.2", features = ["wrap_help", "cargo"] } -nix = { version = "0.24.2", features = ["signal"] } +nix = { version = "0.25", features = ["signal"] } uucore = { version=">=0.0.11", package="uucore", path="../../uucore", features=["signals"] } [[bin]] diff --git a/src/uu/more/Cargo.toml b/src/uu/more/Cargo.toml index 37afd24f1..160ae7acf 100644 --- a/src/uu/more/Cargo.toml +++ b/src/uu/more/Cargo.toml @@ -23,7 +23,7 @@ unicode-width = "0.1.7" unicode-segmentation = "1.9.0" [target.'cfg(all(unix, not(target_os = "fuchsia")))'.dependencies] -nix = { version = "0.24.2", default-features = false } +nix = { version = "0.25", default-features = false } [[bin]] name = "more" diff --git a/src/uu/nice/Cargo.toml b/src/uu/nice/Cargo.toml index b838ec2a2..650a5cbf8 100644 --- a/src/uu/nice/Cargo.toml +++ b/src/uu/nice/Cargo.toml @@ -17,7 +17,7 @@ path = "src/nice.rs" [dependencies] clap = { version = "3.2", features = ["wrap_help", "cargo"] } libc = "0.2.126" -nix = { version = "0.24.2", default-features = false } +nix = { version = "0.25", default-features = false } uucore = { version=">=0.0.11", package="uucore", path="../../uucore" } [[bin]] diff --git a/src/uu/tail/Cargo.toml b/src/uu/tail/Cargo.toml index 269bb490d..8c51de5fd 100644 --- a/src/uu/tail/Cargo.toml +++ b/src/uu/tail/Cargo.toml @@ -26,7 +26,7 @@ winapi = { version="0.3", features=["fileapi", "handleapi", "processthreadsapi", winapi-util = { version="0.1.5" } [target.'cfg(unix)'.dependencies] -nix = { version = "0.24.2", features = ["fs"] } +nix = { version = "0.25", features = ["fs"] } [[bin]] name = "tail" diff --git a/src/uu/timeout/Cargo.toml b/src/uu/timeout/Cargo.toml index c74ec413c..b87f96a39 100644 --- a/src/uu/timeout/Cargo.toml +++ b/src/uu/timeout/Cargo.toml @@ -17,7 +17,7 @@ path = "src/timeout.rs" [dependencies] clap = { version = "3.2", features = ["wrap_help", "cargo"] } libc = "0.2.126" -nix = { version = "0.24.2", default-features = false, features = ["signal"] } +nix = { version = "0.25", default-features = false, features = ["signal"] } uucore = { version=">=0.0.11", package="uucore", path="../../uucore", features=["process", "signals"] } [[bin]] diff --git a/src/uu/wc/Cargo.toml b/src/uu/wc/Cargo.toml index c926d2431..9b8fe993c 100644 --- a/src/uu/wc/Cargo.toml +++ b/src/uu/wc/Cargo.toml @@ -22,7 +22,7 @@ utf-8 = "0.7.6" unicode-width = "0.1.8" [target.'cfg(unix)'.dependencies] -nix = { version = "0.24.2", default-features = false } +nix = { version = "0.25", default-features = false } libc = "0.2" [[bin]] diff --git a/src/uu/yes/Cargo.toml b/src/uu/yes/Cargo.toml index 73e19d9ab..fcac80f2c 100644 --- a/src/uu/yes/Cargo.toml +++ b/src/uu/yes/Cargo.toml @@ -20,7 +20,7 @@ libc = "0.2.126" uucore = { version=">=0.0.11", package="uucore", path="../../uucore", features=["pipes"] } [target.'cfg(any(target_os = "linux", target_os = "android"))'.dependencies] -nix = { version = "0.24.2", default-features = false } +nix = { version = "0.25", default-features = false } [[bin]] name = "yes" diff --git a/src/uucore/Cargo.toml b/src/uucore/Cargo.toml index 45c750739..d6f944751 100644 --- a/src/uucore/Cargo.toml +++ b/src/uucore/Cargo.toml @@ -38,7 +38,7 @@ os_display = "0.1.3" [target.'cfg(unix)'.dependencies] walkdir = { version="2.3.2", optional=true } -nix = { version = "0.24.2", optional = true, default-features = false, features = ["fs", "uio", "zerocopy"] } +nix = { version = "0.25", optional = true, default-features = false, features = ["fs", "uio", "zerocopy"] } [dev-dependencies] clap = "3.2"