From f6294226e8e7877245432425cd4066de6957f4d7 Mon Sep 17 00:00:00 2001 From: Samuel Ortiz Date: Fri, 25 Jun 2021 02:58:12 +0200 Subject: [PATCH] cargo: Use latest nix crate for all Rust code bases Our dependencies already bring several versions of nix, we should avoid adding even more fragementation. Fixes #2114 Signed-off-by: Samuel Ortiz --- src/agent/Cargo.lock | 4 ++- src/agent/vsock-exporter/Cargo.toml | 2 +- src/trace-forwarder/Cargo.lock | 22 ++++++++++---- src/trace-forwarder/Cargo.toml | 2 +- tools/agent-ctl/Cargo.lock | 45 ++++++++++++++++++----------- tools/agent-ctl/Cargo.toml | 2 +- 6 files changed, 51 insertions(+), 26 deletions(-) diff --git a/src/agent/Cargo.lock b/src/agent/Cargo.lock index 4321255ca1..c5230ee787 100644 --- a/src/agent/Cargo.lock +++ b/src/agent/Cargo.lock @@ -1,5 +1,7 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. +version = 3 + [[package]] name = "addr2line" version = "0.15.1" @@ -1783,7 +1785,7 @@ dependencies = [ "bincode", "byteorder", "libc", - "nix 0.20.0", + "nix 0.21.0", "opentelemetry", "serde", "slog", diff --git a/src/agent/vsock-exporter/Cargo.toml b/src/agent/vsock-exporter/Cargo.toml index b91ca4f18c..acb4b5c2fa 100644 --- a/src/agent/vsock-exporter/Cargo.toml +++ b/src/agent/vsock-exporter/Cargo.toml @@ -7,7 +7,7 @@ edition = "2018" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -nix = "0.20.0" +nix = "0.21.0" libc = "0.2.94" thiserror = "1.0.24" opentelemetry = { version = "0.14.0", features=["serialize"] } diff --git a/src/trace-forwarder/Cargo.lock b/src/trace-forwarder/Cargo.lock index b6d4c1beac..11d1404820 100644 --- a/src/trace-forwarder/Cargo.lock +++ b/src/trace-forwarder/Cargo.lock @@ -1,5 +1,7 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. +version = 3 + [[package]] name = "ansi_term" version = "0.11.0" @@ -330,7 +332,7 @@ dependencies = [ "futures", "libc", "logging", - "nix 0.20.0", + "nix 0.21.0", "opentelemetry", "opentelemetry-jaeger", "protobuf", @@ -352,9 +354,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.94" +version = "0.2.97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18794a8ad5b29321f790b55d93dfba91e125cb1a9edbd4f8e3150acc771c1a5e" +checksum = "12b8adadd720df158f4d70dfe7ccc6adb0472d7c55ca83445f6a5ab3e36f8fb6" [[package]] name = "log" @@ -397,6 +399,15 @@ version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400" +[[package]] +name = "memoffset" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59accc507f1338036a0477ef61afdae33cde60840f4dfe481319ce3ad116ddf9" +dependencies = [ + "autocfg", +] + [[package]] name = "nix" version = "0.19.1" @@ -411,14 +422,15 @@ dependencies = [ [[package]] name = "nix" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa9b4819da1bc61c0ea48b63b7bc8604064dd43013e7cc325df098d49cd7c18a" +checksum = "5c3728fec49d363a50a8828a190b379a446cc5cf085c06259bbbeb34447e4ec7" dependencies = [ "bitflags", "cc", "cfg-if 1.0.0", "libc", + "memoffset", ] [[package]] diff --git a/src/trace-forwarder/Cargo.toml b/src/trace-forwarder/Cargo.toml index b2344a51e6..3f790121ef 100644 --- a/src/trace-forwarder/Cargo.toml +++ b/src/trace-forwarder/Cargo.toml @@ -13,7 +13,7 @@ edition = "2018" futures = "0.3.15" clap = "2.33.0" vsock = "0.2.3" -nix = "0.20.0" +nix = "0.21.0" libc = "0.2.94" serde = { version = "1.0.126", features = ["derive"] } bincode = "1.3.3" diff --git a/tools/agent-ctl/Cargo.lock b/tools/agent-ctl/Cargo.lock index a52c722d3c..8cc741c550 100644 --- a/tools/agent-ctl/Cargo.lock +++ b/tools/agent-ctl/Cargo.lock @@ -1,5 +1,7 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. +version = 3 + [[package]] name = "addr2line" version = "0.15.1" @@ -485,7 +487,7 @@ dependencies = [ "lazy_static", "libc", "logging", - "nix 0.17.0", + "nix 0.21.0", "oci", "protobuf", "protocols", @@ -506,9 +508,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.94" +version = "0.2.97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18794a8ad5b29321f790b55d93dfba91e125cb1a9edbd4f8e3150acc771c1a5e" +checksum = "12b8adadd720df158f4d70dfe7ccc6adb0472d7c55ca83445f6a5ab3e36f8fb6" [[package]] name = "log" @@ -536,6 +538,15 @@ version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b16bd47d9e329435e309c58469fe0791c2d0d1ba96ec0954152a5ae2b04387dc" +[[package]] +name = "memoffset" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59accc507f1338036a0477ef61afdae33cde60840f4dfe481319ce3ad116ddf9" +dependencies = [ + "autocfg", +] + [[package]] name = "miniz_oxide" version = "0.4.4" @@ -587,19 +598,6 @@ dependencies = [ "void", ] -[[package]] -name = "nix" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50e4785f2c3b7589a0d0c1dd60285e1188adac4006e8abd6dd578e1567027363" -dependencies = [ - "bitflags", - "cc", - "cfg-if 0.1.10", - "libc", - "void", -] - [[package]] name = "nix" version = "0.19.1" @@ -624,6 +622,19 @@ dependencies = [ "libc", ] +[[package]] +name = "nix" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c3728fec49d363a50a8828a190b379a446cc5cf085c06259bbbeb34447e4ec7" +dependencies = [ + "bitflags", + "cc", + "cfg-if 1.0.0", + "libc", + "memoffset", +] + [[package]] name = "ntapi" version = "0.3.6" @@ -999,7 +1010,7 @@ dependencies = [ "inotify", "lazy_static", "libc", - "nix 0.17.0", + "nix 0.21.0", "oci", "path-absolutize", "protobuf", diff --git a/tools/agent-ctl/Cargo.toml b/tools/agent-ctl/Cargo.toml index 693e3f4e3a..95e640edde 100644 --- a/tools/agent-ctl/Cargo.toml +++ b/tools/agent-ctl/Cargo.toml @@ -26,7 +26,7 @@ slog-scope = "4.3.0" rand = "0.7.3" protobuf = "2.14.0" -nix = "0.17.0" +nix = "0.21.0" libc = "0.2.69" # XXX: Must be the same as the version used by the agent ttrpc = { version = "0.5.0" }