Merge #1862

1862: Bump MSRV to 1.63 for I/O safety r=asomers a=SUPERCILEX Prep for #1750 Co-authored-by: Alex Saveau <[email protected]>
nix-rust · Dec 4, 2022 · e756c96 · e756c96
2 parents 3286c4d + bc2b023
commit e756c96
Show file tree

Hide file tree

Showing 15 changed files with 67 additions and 80 deletions.
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -9,7 +9,7 @@ env:
   RUSTDOCFLAGS: -D warnings
   TOOL: cargo
   # The MSRV
-  TOOLCHAIN: 1.56.1
+  TOOLCHAIN: 1.63.0
   ZFLAGS:
 
 # Tests that don't require executing the build binaries
@@ -140,18 +140,18 @@ task:
   matrix:
     - name: Linux aarch64
       arm_container:
-        image: rust:1.56
+        image: rust:1.63.0
       env:
         RUSTFLAGS: --cfg graviton -D warnings
         TARGET: aarch64-unknown-linux-gnu
     - name: Linux x86_64
       container:
-        image: rust:1.56
+        image: rust:1.63.0
       env:
         TARGET: x86_64-unknown-linux-gnu
     - name: Linux x86_64 musl
       container:
-        image: rust:1.56
+        image: rust:1.63.0
       env:
         TARGET: x86_64-unknown-linux-musl
   setup_script:
@@ -176,7 +176,7 @@ task:
 # Tasks for cross-compiling, but no testing
 task:
   container:
-    image: rust:1.56
+    image: rust:1.63.0
   env:
     BUILD: check
     HOST: x86_64-unknown-linux-gnu
@@ -250,7 +250,7 @@ task:
 
 task:
   container:
-    image: rust:1.56
+    image: rust:1.63.0
   env:
     BUILD: check
   name: Redox x86_64

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,10 @@ This project adheres to [Semantic Versioning](https://semver.org/).
   (#[1662](https://github.com/nix-rust/nix/pull/1662))
 
 ### Changed
+
+- The MSRV is now 1.63
+  ([#1862](https://github.com/nix-rust/nix/pull/1862))
+
 ### Fixed
 ### Removed
 

diff --git a/Cargo.toml b/Cargo.toml
@@ -1,9 +1,9 @@
 [package]
 name        = "nix"
 description = "Rust friendly bindings to *nix APIs"
-edition     = "2018"
+edition     = "2021"
 version     = "0.26.1"
-rust-version = "1.56"
+rust-version = "1.63"
 authors     = ["The nix-rust Project Developers"]
 repository  = "https://github.com/nix-rust/nix"
 license     = "MIT"

diff --git a/README.md b/README.md
@@ -89,7 +89,7 @@ Tier 3:
 
 ## Minimum Supported Rust Version (MSRV)
 
-nix is supported on Rust 1.56.1 and higher.  Its MSRV will not be
+nix is supported on Rust 1.63 and higher.  Its MSRV will not be
 changed in the future without bumping the major or minor version.
 
 ## Contributing

diff --git a/src/sys/aio.rs b/src/sys/aio.rs
@@ -163,7 +163,7 @@ impl AioCb {
             0 => Ok(()),
             num if num > 0 => Err(Errno::from_i32(num)),
             -1 => Err(Errno::last()),
-            num => panic!("unknown aio_error return value {:?}", num),
+            num => panic!("unknown aio_error return value {num:?}"),
         }
     }
 

diff --git a/src/sys/socket/addr.rs b/src/sys/socket/addr.rs
@@ -2373,7 +2373,7 @@ mod tests {
                 sdl_slen: 0,
                 ..unsafe { mem::zeroed() }
             });
-            format!("{}", la);
+            format!("{la}");
         }
 
         #[cfg(all(
@@ -2495,7 +2495,7 @@ mod tests {
         fn display() {
             let s = "127.0.0.1:8080";
             let addr = SockaddrIn::from_str(s).unwrap();
-            assert_eq!(s, format!("{}", addr));
+            assert_eq!(s, format!("{addr}"));
         }
 
         #[test]
@@ -2515,7 +2515,7 @@ mod tests {
         fn display() {
             let s = "[1234:5678:90ab:cdef::1111:2222]:8080";
             let addr = SockaddrIn6::from_str(s).unwrap();
-            assert_eq!(s, format!("{}", addr));
+            assert_eq!(s, format!("{addr}"));
         }
 
         #[test]

diff --git a/src/sys/socket/mod.rs b/src/sys/socket/mod.rs
@@ -12,7 +12,6 @@ use libc::{
     self, c_int, c_void, iovec, size_t, socklen_t, CMSG_DATA, CMSG_FIRSTHDR,
     CMSG_LEN, CMSG_NXTHDR,
 };
-use std::convert::TryFrom;
 use std::io::{IoSlice, IoSliceMut};
 #[cfg(feature = "net")]
 use std::net;

diff --git a/src/sys/socket/sockopt.rs b/src/sys/socket/sockopt.rs
@@ -6,13 +6,10 @@ use crate::Result;
 use cfg_if::cfg_if;
 use libc::{self, c_int, c_void, socklen_t};
 use std::ffi::{OsStr, OsString};
+use std::mem::{self, MaybeUninit};
 #[cfg(target_family = "unix")]
 use std::os::unix::ffi::OsStrExt;
 use std::os::unix::io::RawFd;
-use std::{
-    convert::TryFrom,
-    mem::{self, MaybeUninit},
-};
 
 // Constants
 // TCP_CA_NAME_MAX isn't defined in user space include files

diff --git a/src/sys/time.rs b/src/sys/time.rs
@@ -261,8 +261,7 @@ impl TimeValLike for TimeSpec {
     fn seconds(seconds: i64) -> TimeSpec {
         assert!(
             (TS_MIN_SECONDS..=TS_MAX_SECONDS).contains(&seconds),
-            "TimeSpec out of bounds; seconds={}",
-            seconds
+            "TimeSpec out of bounds; seconds={seconds}",
         );
         let mut ts = zero_init_timespec();
         ts.tv_sec = seconds as time_t;
@@ -428,20 +427,20 @@ impl fmt::Display for TimeSpec {
 
         let sec = abs.tv_sec();
 
-        write!(f, "{}", sign)?;
+        write!(f, "{sign}")?;
 
         if abs.tv_nsec() == 0 {
-            if abs.tv_sec() == 1 {
-                write!(f, "{} second", sec)?;
+            if sec == 1 {
+                write!(f, "1 second")?;
             } else {
-                write!(f, "{} seconds", sec)?;
+                write!(f, "{sec} seconds")?;
             }
         } else if abs.tv_nsec() % 1_000_000 == 0 {
-            write!(f, "{}.{:03} seconds", sec, abs.tv_nsec() / 1_000_000)?;
+            write!(f, "{sec}.{:03} seconds", abs.tv_nsec() / 1_000_000)?;
         } else if abs.tv_nsec() % 1_000 == 0 {
-            write!(f, "{}.{:06} seconds", sec, abs.tv_nsec() / 1_000)?;
+            write!(f, "{sec}.{:06} seconds", abs.tv_nsec() / 1_000)?;
         } else {
-            write!(f, "{}.{:09} seconds", sec, abs.tv_nsec())?;
+            write!(f, "{sec}.{:09} seconds", abs.tv_nsec())?;
         }
 
         Ok(())
@@ -497,8 +496,7 @@ impl TimeValLike for TimeVal {
     fn seconds(seconds: i64) -> TimeVal {
         assert!(
             (TV_MIN_SECONDS..=TV_MAX_SECONDS).contains(&seconds),
-            "TimeVal out of bounds; seconds={}",
-            seconds
+            "TimeVal out of bounds; seconds={seconds}"
         );
         #[cfg_attr(target_env = "musl", allow(deprecated))]
         // https://github.com/rust-lang/libc/issues/1848
@@ -662,18 +660,18 @@ impl fmt::Display for TimeVal {
 
         let sec = abs.tv_sec();
 
-        write!(f, "{}", sign)?;
+        write!(f, "{sign}")?;
 
         if abs.tv_usec() == 0 {
-            if abs.tv_sec() == 1 {
-                write!(f, "{} second", sec)?;
+            if sec == 1 {
+                write!(f, "1 second")?;
             } else {
-                write!(f, "{} seconds", sec)?;
+                write!(f, "{sec} seconds")?;
             }
         } else if abs.tv_usec() % 1000 == 0 {
-            write!(f, "{}.{:03} seconds", sec, abs.tv_usec() / 1000)?;
+            write!(f, "{sec}.{:03} seconds", abs.tv_usec() / 1000)?;
         } else {
-            write!(f, "{}.{:06} seconds", sec, abs.tv_usec())?;
+            write!(f, "{sec}.{:06} seconds", abs.tv_usec())?;
         }
 
         Ok(())

diff --git a/test/sys/test_aio.rs b/test/sys/test_aio.rs
@@ -610,7 +610,7 @@ fn test_aio_suspend() {
             let r = aio_suspend(&cbbuf[..], Some(timeout));
             match r {
                 Err(Errno::EINTR) => continue,
-                Err(e) => panic!("aio_suspend returned {:?}", e),
+                Err(e) => panic!("aio_suspend returned {e:?}"),
                 Ok(_) => (),
             };
         }

diff --git a/test/sys/test_signal.rs b/test/sys/test_signal.rs
@@ -54,9 +54,8 @@ fn test_sigprocmask() {
     // test don't make sense.
     assert!(
         !old_signal_set.contains(SIGNAL),
-        "the {:?} signal is already blocked, please change to a \
-             different one",
-        SIGNAL
+        "the {SIGNAL:?} signal is already blocked, please change to a \
+             different one"
     );
 
     // Now block the signal.
@@ -71,8 +70,7 @@ fn test_sigprocmask() {
         .expect("expect to be able to retrieve old signals");
     assert!(
         old_signal_set.contains(SIGNAL),
-        "expected the {:?} to be blocked",
-        SIGNAL
+        "expected the {SIGNAL:?} to be blocked"
     );
 
     // Reset the signal.

diff --git a/test/sys/test_socket.rs b/test/sys/test_socket.rs
@@ -626,7 +626,7 @@ mod recvfrom {
                 println!("IPv6 not available, skipping test.");
                 return;
             }
-            Err(e) => panic!("bind: {}", e),
+            Err(e) => panic!("bind: {e}"),
             Ok(()) => (),
         }
         let ssock = socket(
@@ -1272,7 +1272,7 @@ fn test_scm_credentials() {
                 ControlMessageOwned::ScmCredentials(cred) => cred,
                 #[cfg(any(target_os = "freebsd", target_os = "dragonfly"))]
                 ControlMessageOwned::ScmCreds(cred) => cred,
-                other => panic!("unexpected cmsg {:?}", other),
+                other => panic!("unexpected cmsg {other:?}"),
             };
             assert!(received_cred.is_none());
             assert_eq!(cred.pid(), getpid().as_raw());
@@ -1550,7 +1550,7 @@ fn loopback_address(
         Err(e) => {
             let stdioerr = io::stderr();
             let mut handle = stdioerr.lock();
-            writeln!(handle, "getifaddrs: {:?}", e).unwrap();
+            writeln!(handle, "getifaddrs: {e:?}").unwrap();
             return None;
         }
     };
@@ -2347,7 +2347,7 @@ mod linux_errqueue {
                     }
                     *ext_err
                 } else {
-                    panic!("Unexpected control message {:?}", cmsg);
+                    panic!("Unexpected control message {cmsg:?}");
                 }
             },
         )
@@ -2398,7 +2398,7 @@ mod linux_errqueue {
                     }
                     *ext_err
                 } else {
-                    panic!("Unexpected control message {:?}", cmsg);
+                    panic!("Unexpected control message {cmsg:?}");
                 }
             },
         )
@@ -2432,7 +2432,7 @@ mod linux_errqueue {
             MsgFlags::empty(),
         ) {
             assert_eq!(e, Errno::EADDRNOTAVAIL);
-            println!("{:?} not available, skipping test.", af);
+            println!("{af:?} not available, skipping test.");
             return;
         }
 

diff --git a/test/test_fcntl.rs b/test/test_fcntl.rs
@@ -559,7 +559,7 @@ mod test_posix_fallocate {
         let err = posix_fallocate(rd as RawFd, 0, 100).unwrap_err();
         match err {
             Errno::EINVAL | Errno::ENODEV | Errno::ESPIPE | Errno::EBADF => (),
-            errno => panic!("unexpected errno {}", errno,),
+            errno => panic!("unexpected errno {errno}",),
         }
     }
 }