Merge branch 'master' into socket-mss

Author: eaon

.cirrus.yml

@@ -2,27 +2,53 @@ cargo_cache:
   folder: $CARGO_HOME/registry
   fingerprint_script: cat Cargo.lock || echo ""
 
+env:
+  # Build by default; don't just check
+  BUILD: build
+  RUSTFLAGS: -D warnings
+  RUSTDOCFLAGS: -D warnings
+  TOOL: cargo
+  # The MSRV
+  TOOLCHAIN: 1.46.0
+  ZFLAGS:
+
+# Tests that don't require executing the build binaries
+build: &BUILD
+  build_script:
+    - . $HOME/.cargo/env || true
+    - $TOOL +$TOOLCHAIN $BUILD $ZFLAGS --target $TARGET --all-targets
+    - $TOOL +$TOOLCHAIN doc $ZFLAGS --no-deps --target $TARGET
+
+# Tests that do require executing the binaries
+test: &TEST
+  << : *BUILD
+  test_script:
+    - . $HOME/.cargo/env || true
+    - $TOOL +$TOOLCHAIN test --target $TARGET
+
 # Test FreeBSD in a full VM.  Test the i686 target too, in the
 # same VM.  The binary will be built in 32-bit mode, but will execute on a
 # 64-bit kernel and in a 64-bit environment.  Our tests don't execute any of
 # the system's binaries, so the environment shouldn't matter.
 task:
   name: FreeBSD amd64 & i686
+  env:
+    TARGET: x86_64-unknown-freebsd
   freebsd_instance:
     image: freebsd-11-4-release-amd64
   setup_script:
     - fetch https://sh.rustup.rs -o rustup.sh
-    - sh rustup.sh -y --profile=minimal --default-toolchain 1.46.0
+    - sh rustup.sh -y --profile=minimal --default-toolchain $TOOLCHAIN
     - $HOME/.cargo/bin/rustup target add i686-unknown-freebsd
-  amd64_test_script:
-    - . $HOME/.cargo/env
-    - cargo test
+  << : *TEST
   i386_test_script:
     - . $HOME/.cargo/env
+    - cargo build --target i686-unknown-freebsd
+    - cargo doc --no-deps --target i686-unknown-freebsd
     - cargo test --target i686-unknown-freebsd
   before_cache_script: rm -rf $CARGO_HOME/registry/index
 
-# Test OSX and iOS in a full VM
+# Test OSX in a full VM
 task:
   matrix:
     - name: OSX x86_64
@@ -32,13 +58,9 @@ task:
     image: catalina-xcode
   setup_script:
     - curl --proto '=https' --tlsv1.2 -sSf -o rustup.sh https://sh.rustup.rs
-    - sh rustup.sh -y --profile=minimal --default-toolchain 1.46.0
-    - . $HOME/.cargo/env
-    - cargo install cross
-  script:
+    - sh rustup.sh -y --profile=minimal --default-toolchain $TOOLCHAIN
     - . $HOME/.cargo/env
-    - cross build --target $TARGET
-    - cross test --target $TARGET
+  << : *TEST
   before_cache_script: rm -rf $CARGO_HOME/registry/index
 
 # Use cross for QEMU-based testing
@@ -48,10 +70,9 @@ task:
     RUST_TEST_THREADS: 1            # QEMU works best with 1 thread
     HOME: /tmp/home
     PATH: $HOME/.cargo/bin:$PATH
+    RUSTFLAGS: --cfg qemu -D warnings
+    TOOL: cross
   matrix:
-    - name: Linux aarch64
-      env:
-        TARGET: aarch64-unknown-linux-gnu
     - name: Linux arm gnueabi
       env:
         TARGET: arm-unknown-linux-gnueabi
@@ -88,46 +109,48 @@ task:
   setup_script:
     - mkdir /tmp/home
     - curl --proto '=https' --tlsv1.2 -sSf -o rustup.sh https://sh.rustup.rs
-    - sh rustup.sh -y --profile=minimal --default-toolchain 1.46.0
+    - sh rustup.sh -y --profile=minimal --default-toolchain $TOOLCHAIN
     - . $HOME/.cargo/env
     - cargo install cross
-  script:
-    - . $HOME/.cargo/env || true
-    - cross build --target $TARGET
-    - cross test --target $TARGET
+  << : *TEST
   before_cache_script: rm -rf $CARGO_HOME/registry/index
 
-# Tasks for Linux amd64 builds
+# Tasks for Linux native builds
 task:
   matrix:
     - name: Rust Stable
+      container:
+        image: rust:latest
       env:
         TARGET: x86_64-unknown-linux-gnu
-        TOOLCHAIN: stable
+        TOOLCHAIN:
+    - name: Linux aarch64
+      arm_container:
+        image: rust:1.46
+      env:
+        RUSTFLAGS: --cfg graviton -D warnings
+        TARGET: aarch64-unknown-linux-gnu
     - name: Linux x86_64
+      container:
+        image: rust:1.46
       env:
         TARGET: x86_64-unknown-linux-gnu
-        TOOLCHAIN: 1.46.0
     - name: Linux x86_64 musl
+      container:
+        image: rust:1.46
       env:
         TARGET: x86_64-unknown-linux-musl
-        TOOLCHAIN: 1.46.0
-  container:
-    image: rust:1.46
   setup_script:
-    - rustup toolchain install $TOOLCHAIN
-    - rustup target add --toolchain $TOOLCHAIN $TARGET
-  script:
-    - cargo +$TOOLCHAIN build --target $TARGET --all-targets
-    - cargo +$TOOLCHAIN test --target $TARGET
+    - rustup target add $TARGET
+  << : *TEST
   before_cache_script: rm -rf $CARGO_HOME/registry/index
 
 # Tasks for cross-compiling, but no testing
 task:
   container:
     image: rust:1.46
   env:
-    TOOLCHAIN: 1.46.0
+    BUILD: check
   matrix:
     # Cross claims to support Android, but when it tries to run Nix's tests it
     # reports undefined symbol references.
@@ -166,8 +189,7 @@ task:
         TARGET: aarch64-apple-ios
         # Rustup only supports cross-building from arbitrary hosts for iOS at
         # 1.49.0 and above.  Below that it's possible to cross-build from an OSX
-        # host, but OSX VMs
-        # are more expensive than Linux VMs.
+        # host, but OSX VMs are more expensive than Linux VMs.
         TOOLCHAIN: 1.49.0
     - name: iOS x86_64
       env:
@@ -202,16 +224,36 @@ task:
   setup_script:
     - rustup target add $TARGET
     - rustup toolchain install $TOOLCHAIN --profile minimal --target $TARGET
-  script:
-    - cargo +$TOOLCHAIN check --target $TARGET
-    - cargo +$TOOLCHAIN check --all-targets --target $TARGET
+  << : *BUILD
+  before_cache_script: rm -rf $CARGO_HOME/registry/index
+
+# Rust Tier 3 targets can't use Rustup
+task:
+  container:
+    image: rustlang/rust:nightly
+  env:
+    BUILD: check
+    TOOLCHAIN: nightly
+    ZFLAGS: -Zbuild-std
+  matrix:
+    - name: DragonFly BSD x86_64
+      env:
+        TARGET: x86_64-unknown-dragonfly
+    - name: OpenBSD x86_64
+      env:
+        TARGET: x86_64-unknown-openbsd
+  setup_script:
+    - rustup component add rust-src
+  << : *BUILD
   before_cache_script: rm -rf $CARGO_HOME/registry/index
 
 # Test that we can build with the lowest version of all dependencies.
 # "cargo test" doesn't work because some of our dev-dependencies, like
 # rand, can't build with their own minimal dependencies.
 task:
   name: Minver
+  env:
+    TOOLCHAIN: nightly
   container:
     image: rustlang/rust:nightly
   setup_script:

CHANGELOG.md

@@ -30,6 +30,10 @@ This project adheres to [Semantic Versioning](https://semver.org/).
   (#[1335](https://github.com/nix-rust/nix/pull/1335))
 - Exposed `SockAddr::from_raw_sockaddr`
   (#[1447](https://github.com/nix-rust/nix/pull/1447))
+- Added `TcpRepair`
+  (#[1503](https://github.com/nix-rust/nix/pull/1503))
+- Enabled `pwritev` and `preadv` for more operating systems.
+  (#[1511](https://github.com/nix-rust/nix/pull/1511))
 - Added support for `TCP_MAXSEG` TCP Maximum Segment Size socket options
   (#[1292](https://github.com/nix-rust/nix/pull/1292))
 
@@ -76,6 +80,7 @@ This project adheres to [Semantic Versioning](https://semver.org/).
 - Removed a couple of termios constants on redox that were never actually
   supported.
   (#[1483](https://github.com/nix-rust/nix/pull/1483))
+
 - Removed `nix::sys::signal::NSIG`.  It was of dubious utility, and not correct
   for all platforms.
   (#[1484](https://github.com/nix-rust/nix/pull/1484))
@@ -87,6 +92,9 @@ This project adheres to [Semantic Versioning](https://semver.org/).
 - Deprecated `SockAddr/InetAddr::to_str` in favor of `ToString::to_string`
   (#[1495](https://github.com/nix-rust/nix/pull/1495))
 
+- Removed `SigevNotify` on OpenBSD and Redox.
+  (#[1511](https://github.com/nix-rust/nix/pull/1511))
+
 ## [0.22.0] - 9 July 2021
 ### Added
 - Added `if_nameindex` (#[1445](https://github.com/nix-rust/nix/pull/1445))

Cargo.toml

@@ -25,7 +25,7 @@ targets = [
 ]
 
 [dependencies]
-libc = { git = "https://github.com/rust-lang/libc", rev = "f5e31f208", features = [ "extra_traits" ] }
+libc = { git = "https://github.com/rust-lang/libc", rev = "621a95373", features = [ "extra_traits" ] }
 bitflags = "1.3.1"
 cfg-if = "1.0"
 

Cross.toml

@@ -1,2 +1,5 @@
 [build.env]
-passthrough = ["RUST_TEST_THREADS"]
+passthrough = [
+	"RUSTFLAGS",
+	"RUST_TEST_THREADS"
+]

README.md

@@ -74,12 +74,15 @@ Tier 2:
   * s390x-unknown-linux-gnu
   * x86_64-apple-ios
   * x86_64-linux-android
+  * x86_64-unknown-illumos
   * x86_64-unknown-netbsd
 
 Tier 3:
   * x86_64-fuchsia
-  * x86_64-unknown-redox
+  * x86_64-unknown-dragonfly
   * x86_64-unknown-linux-gnux32
+  * x86_64-unknown-openbsd
+  * x86_64-unknown-redox
 
 ## Usage
 

bors.toml

@@ -4,6 +4,7 @@ status = [
   "Android armv7",
   "Android i686",
   "Android x86_64",
+  "DragonFly BSD x86_64",
   "FreeBSD amd64 & i686",
   "Fuchsia x86_64",
   "Linux MIPS",
@@ -25,12 +26,13 @@ status = [
   "Linux x86_64",
   "Minver",
   "NetBSD x86_64",
+  "OpenBSD x86_64",
   "OSX x86_64",
   "Redox x86_64",
   "Rust Stable",
   "iOS aarch64",
   "iOS x86_64",
-  "illumos",
+  "Illumos",
 ]
 
 # Set bors's timeout to 1 hour

src/env.rs

@@ -1,3 +1,4 @@
+//! Environment variables
 use cfg_if::cfg_if;
 use std::fmt;
 

src/lib.rs

@@ -5,15 +5,13 @@
 #![crate_name = "nix"]
 #![cfg(unix)]
 #![allow(non_camel_case_types)]
-// latest bitflags triggers a rustc bug with cross-crate macro expansions causing dead_code
-// warnings even though the macro expands into something with allow(dead_code)
-#![allow(dead_code)]
 #![cfg_attr(test, deny(warnings))]
 #![recursion_limit = "500"]
 #![deny(unused)]
 #![deny(unstable_features)]
 #![deny(missing_copy_implementations)]
 #![deny(missing_debug_implementations)]
+#![warn(missing_docs)]
 
 // Re-exported external crates
 pub use libc;
@@ -23,13 +21,14 @@ pub use libc;
 
 // Public crates
 #[cfg(not(target_os = "redox"))]
+#[allow(missing_docs)]
 pub mod dir;
 pub mod env;
+#[allow(missing_docs)]
 pub mod errno;
-#[deny(missing_docs)]
 pub mod features;
+#[allow(missing_docs)]
 pub mod fcntl;
-#[deny(missing_docs)]
 #[cfg(any(target_os = "android",
           target_os = "dragonfly",
           target_os = "freebsd",
@@ -42,6 +41,7 @@ pub mod fcntl;
 pub mod ifaddrs;
 #[cfg(any(target_os = "android",
           target_os = "linux"))]
+#[allow(missing_docs)]
 pub mod kmod;
 #[cfg(any(target_os = "android",
           target_os = "freebsd",
@@ -52,23 +52,24 @@ pub mod mount;
           target_os = "fushsia",
           target_os = "linux",
           target_os = "netbsd"))]
+#[allow(missing_docs)]
 pub mod mqueue;
-#[deny(missing_docs)]
 #[cfg(not(target_os = "redox"))]
 pub mod net;
-#[deny(missing_docs)]
 pub mod poll;
-#[deny(missing_docs)]
 #[cfg(not(any(target_os = "redox", target_os = "fuchsia")))]
 pub mod pty;
 pub mod sched;
 pub mod sys;
+#[allow(missing_docs)]
 pub mod time;
 // This can be implemented for other platforms as soon as libc
 // provides bindings for them.
 #[cfg(all(target_os = "linux",
           any(target_arch = "x86", target_arch = "x86_64")))]
+#[allow(missing_docs)]
 pub mod ucontext;
+#[allow(missing_docs)]
 pub mod unistd;
 
 /*
@@ -101,11 +102,17 @@ pub type Result<T> = result::Result<T, Errno>;
 /// ones.
 pub type Error = Errno;
 
+/// Common trait used to represent file system paths by many Nix functions.
 pub trait NixPath {
+    /// Is the path empty?
     fn is_empty(&self) -> bool;
 
+    /// Length of the path in bytes
     fn len(&self) -> usize;
 
+    /// Execute a function with this path as a `CStr`.
+    ///
+    /// Mostly used internally by Nix.
     fn with_nix_path<T, F>(&self, f: F) -> Result<T>
         where F: FnOnce(&CStr) -> T;
 }

src/mount/bsd.rs

@@ -347,6 +347,7 @@ impl<'a> Nmount<'a> {
         self
     }
 
+    /// Create a new `Nmount` struct with no options
     pub fn new() -> Self {
         Self::default()
     }