Skip to content

Commit

Permalink
cargo: Use latest nix crate for all Rust code bases
Browse files Browse the repository at this point in the history
Our dependencies already bring several versions of nix, we should avoid
adding even more fragementation.

Fixes #2114

Signed-off-by: Samuel Ortiz <samuel.e.ortiz@protonmail.com>
  • Loading branch information
sameo committed Jun 25, 2021
1 parent ac0bd57 commit f629422
Show file tree
Hide file tree
Showing 6 changed files with 46 additions and 21 deletions.
4 changes: 3 additions & 1 deletion src/agent/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/agent/vsock-exporter/Cargo.toml
Expand Up @@ -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"] }
Expand Down
22 changes: 17 additions & 5 deletions src/trace-forwarder/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/trace-forwarder/Cargo.toml
Expand Up @@ -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"
Expand Down
35 changes: 23 additions & 12 deletions tools/agent-ctl/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion tools/agent-ctl/Cargo.toml
Expand Up @@ -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" }
Expand Down

0 comments on commit f629422

Please sign in to comment.