Merge #1707

1707: Upgrade sysctl to 0.4 r=asomers a=rtzoeller

Upgrade sysctl dev-dependency to 0.4 and handle its breaking API changes.

Co-authored-by: Ryan Zoeller <[email protected]>

Author: bors[bot]

Cargo.toml

@@ -88,7 +88,7 @@ semver = "1.0.0"
 caps = "0.5.1"
 
 [target.'cfg(target_os = "freebsd")'.dev-dependencies]
-sysctl = "0.1"
+sysctl = "0.4"
 
 [[test]]
 name = "test"

src/mount/bsd.rs

@@ -168,8 +168,9 @@ pub type NmountResult = std::result::Result<(), NmountError>;
 /// To mount `target` onto `mountpoint` with `nullfs`:
 /// ```
 /// # use nix::unistd::Uid;
-/// # use ::sysctl::CtlValue;
-/// # if !Uid::current().is_root() && CtlValue::Int(0) == ::sysctl::value("vfs.usermount").unwrap() {
+/// # use ::sysctl::{CtlValue, Sysctl};
+/// # let ctl = ::sysctl::Ctl::new("vfs.usermount").unwrap();
+/// # if !Uid::current().is_root() && CtlValue::Int(0) == ctl.value().unwrap() {
 /// #     return;
 /// # };
 /// use nix::mount::{MntFlags, Nmount, unmount};

test/common/mod.rs

@@ -35,10 +35,11 @@ cfg_if! {
 #[cfg(target_os = "freebsd")]
 #[macro_export] macro_rules! require_mount {
     ($name:expr) => {
-        use ::sysctl::CtlValue;
+        use ::sysctl::{CtlValue, Sysctl};
         use nix::unistd::Uid;
 
-        if !Uid::current().is_root() && CtlValue::Int(0) == ::sysctl::value("vfs.usermount").unwrap()
+        let ctl = ::sysctl::Ctl::new("vfs.usermount").unwrap();
+        if !Uid::current().is_root() && CtlValue::Int(0) == ctl.value().unwrap()
         {
             skip!("{} requires the ability to mount file systems. Skipping test.", $name);
         }
@@ -57,10 +58,10 @@ cfg_if! {
 #[cfg(target_os = "freebsd")]
 #[macro_export] macro_rules! skip_if_jailed {
     ($name:expr) => {
-        use ::sysctl::CtlValue;
+        use ::sysctl::{CtlValue, Sysctl};
 
-        if let CtlValue::Int(1) = ::sysctl::value("security.jail.jailed")
-            .unwrap()
+        let ctl = ::sysctl::Ctl::new("security.jail.jailed").unwrap();
+        if let CtlValue::Int(1) = ctl.value().unwrap()
         {
             skip!("{} cannot run in a jail. Skipping test.", $name);
         }

test/sys/test_lio_listio_resubmit.rs

@@ -11,7 +11,7 @@ use nix::sys::signal::SigevNotify;
 use nix::unistd::{SysconfVar, sysconf};
 use std::os::unix::io::AsRawFd;
 use std::{thread, time};
-use sysctl::CtlValue;
+use sysctl::{CtlValue, Sysctl};
 use tempfile::tempfile;
 
 const BYTES_PER_OP: usize = 512;
@@ -44,8 +44,8 @@ fn test_lio_listio_resubmit() {
     // Lookup system resource limits
     let alm = sysconf(SysconfVar::AIO_LISTIO_MAX)
         .expect("sysconf").unwrap() as usize;
-    let maqpp = if let CtlValue::Int(x) = sysctl::value(
-            "vfs.aio.max_aio_queue_per_proc").unwrap(){
+    let ctl = sysctl::Ctl::new("vfs.aio.max_aio_queue_per_proc").unwrap();
+    let maqpp = if let CtlValue::Int(x) = ctl.value().unwrap() {
         x as usize
     } else {
         panic!("unknown sysctl");