chore: bump nix from 0.23.1 to 0.24.0 (#24548)

* chore: bump nix from 0.23.1 to 0.24.0

Bumps [nix](https://github.com/nix-rust/nix) from 0.23.1 to 0.24.0.
- [Release notes](https://github.com/nix-rust/nix/releases)
- [Changelog](https://github.com/nix-rust/nix/blob/master/CHANGELOG.md)
- [Commits](https://github.com/nix-rust/nix/commits)

---
updated-dependencies:
- dependency-name: nix
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

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

* [auto-commit] Update all Cargo lock files

* allow deprecated

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: dependabot-buildkite <dependabot-buildkite@noreply.solana.com>
Co-authored-by: Tyera Eulberg <tyera@solana.com>
This commit is contained in:
dependabot[bot] 2022-04-22 01:41:11 +00:00 committed by GitHub
parent 7dcc463d5a
commit 8d4e53d23c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 33 additions and 16 deletions

24
Cargo.lock generated
View File

@ -1013,7 +1013,7 @@ version = "3.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a19c6cedffdc8c03a3346d723eb20bd85a13362bb96dc2ac000842c6381ec7bf"
dependencies = [
"nix",
"nix 0.23.1",
"winapi 0.3.9",
]
@ -2539,6 +2539,18 @@ dependencies = [
"memoffset",
]
[[package]]
name = "nix"
version = "0.24.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8f6d99b651ff9697d6710f9613a07c5b4e0d655040faf56b3b471af108d55597"
dependencies = [
"bitflags",
"cfg-if 1.0.0",
"libc",
"memoffset",
]
[[package]]
name = "nom"
version = "6.1.2"
@ -5003,7 +5015,7 @@ dependencies = [
"dirs-next",
"indicatif",
"lazy_static",
"nix",
"nix 0.24.0",
"reqwest",
"semver 1.0.7",
"serde",
@ -5255,7 +5267,7 @@ dependencies = [
"clap 3.1.8",
"crossbeam-channel",
"log",
"nix",
"nix 0.24.0",
"rand 0.7.3",
"serde",
"serde_derive",
@ -5292,7 +5304,7 @@ dependencies = [
"libc",
"log",
"matches",
"nix",
"nix 0.24.0",
"rand 0.7.3",
"rayon",
"serde",
@ -5877,7 +5889,7 @@ dependencies = [
"itertools",
"libc",
"log",
"nix",
"nix 0.24.0",
"pem",
"pkcs8",
"quinn",
@ -5899,7 +5911,7 @@ dependencies = [
"clap 2.33.3",
"libc",
"log",
"nix",
"nix 0.24.0",
"solana-logger 1.11.0",
"solana-version",
"sysctl",

View File

@ -21,7 +21,7 @@ ctrlc = { version = "3.2.1", features = ["termination"] }
dirs-next = "2.0.0"
indicatif = "0.16.2"
lazy_static = "1.4.0"
nix = "0.23.1"
nix = "0.24.0"
reqwest = { version = "0.11.10", default-features = false, features = ["blocking", "rustls-tls", "json"] }
semver = "1.0.7"
serde = { version = "1.0.136", features = ["derive"] }

View File

@ -14,7 +14,7 @@ bincode = "1.3.3"
clap = { version = "3.1.5", features = ["cargo"] }
crossbeam-channel = "0.5"
log = "0.4.14"
nix = "0.23.1"
nix = "0.24.0"
rand = "0.7.0"
serde = "1.0.136"
serde_derive = "1.0.103"

View File

@ -30,7 +30,7 @@ solana-vote-program = { path = "../programs/vote", version = "=1.11.0" }
[target."cfg(target_os = \"linux\")".dependencies]
caps = "0.5.3"
libc = "0.2.124"
nix = "0.23.1"
nix = "0.24.0"
[lib]
name = "solana_perf"

View File

@ -1655,12 +1655,11 @@ dependencies = [
[[package]]
name = "nix"
version = "0.23.1"
version = "0.24.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9f866317acbd3a240710c63f065ffb1e4fd466259045ccb504130b7f668f35c6"
checksum = "8f6d99b651ff9697d6710f9613a07c5b4e0d655040faf56b3b471af108d55597"
dependencies = [
"bitflags",
"cc",
"cfg-if 1.0.0",
"libc",
"memoffset",

View File

@ -16,7 +16,7 @@ histogram = "0.6.9"
itertools = "0.10.3"
libc = "0.2.124"
log = "0.4.14"
nix = "0.23.1"
nix = "0.24.0"
pem = "1.0.2"
pkcs8 = { version = "0.8.0", features = ["alloc"] }
quinn = "0.8.2"

View File

@ -1,5 +1,8 @@
//! The `recvmmsg` module provides recvmmsg() API implementation
#[cfg(target_os = "linux")]
#[allow(deprecated)]
use nix::sys::socket::InetAddr;
pub use solana_perf::packet::NUM_RCVMMSGS;
use {
crate::packet::{Meta, Packet},
@ -9,7 +12,6 @@ use {
use {
itertools::izip,
libc::{iovec, mmsghdr, sockaddr_storage, socklen_t, AF_INET, AF_INET6, MSG_WAITFORONE},
nix::sys::socket::InetAddr,
std::{mem, os::unix::io::AsRawFd},
};
@ -41,6 +43,7 @@ pub fn recv_mmsg(socket: &UdpSocket, packets: &mut [Packet]) -> io::Result</*num
}
#[cfg(target_os = "linux")]
#[allow(deprecated)]
fn cast_socket_addr(addr: &sockaddr_storage, hdr: &mmsghdr) -> Option<InetAddr> {
use libc::{sa_family_t, sockaddr_in, sockaddr_in6};
const SOCKADDR_IN_SIZE: usize = std::mem::size_of::<sockaddr_in>();

View File

@ -1,10 +1,12 @@
//! The `sendmmsg` module provides sendmmsg() API implementation
#[cfg(target_os = "linux")]
#[allow(deprecated)]
use nix::sys::socket::InetAddr;
#[cfg(target_os = "linux")]
use {
itertools::izip,
libc::{iovec, mmsghdr, sockaddr_in, sockaddr_in6, sockaddr_storage},
nix::sys::socket::InetAddr,
std::os::unix::io::AsRawFd,
};
use {
@ -74,6 +76,7 @@ fn mmsghdr_for_packet(
hdr.msg_hdr.msg_iovlen = 1;
hdr.msg_hdr.msg_name = addr as *mut _ as *mut _;
#[allow(deprecated)]
match InetAddr::from_std(dest) {
InetAddr::V4(dest) => {
unsafe {

View File

@ -20,7 +20,7 @@ solana-version = { path = "../version", version = "=1.11.0" }
[target."cfg(unix)".dependencies]
unix_socket2 = "0.5.4"
users = "0.10.0"
nix = "0.23.1"
nix = "0.24.0"
sysctl = "0.4.4"
[lib]