Merge #2019 #2087

2019: Fix aio_suspend in non-trivial cases r=asomers a=asomers

aio_suspend would probably fail with EFAULT if the first operation in the list wasn't complete, due to an invalid pointer cast.

Also, deprecate lio_listio, which has the same problem, and others besides.

Fixes #1980

2087: Fix Haiku build by updating tempfile to 3.7.1 r=asomers a=asomers

Stebalien/tempfile#246

Co-authored-by: Alan Somers <[email protected]>

Author: bors[bot]

Cargo.toml

@@ -80,9 +80,7 @@ assert-impl = "0.1"
 lazy_static = "1.4"
 parking_lot = "0.12"
 rand = "0.8"
-# tempfile 3.7.0 doesn't build on Haiku
-# https://github.com/Stebalien/tempfile/issues/246
-tempfile = ">=3.3.0, < 3.7.0"
+tempfile = "3.7.1"
 semver = "1.0.7"
 
 [target.'cfg(any(target_os = "android", target_os = "linux"))'.dev-dependencies]

src/sys/aio.rs

@@ -1051,8 +1051,14 @@ pub fn aio_suspend(
     list: &[&dyn AsRef<libc::aiocb>],
     timeout: Option<TimeSpec>,
 ) -> Result<()> {
-    let p = list as *const [&dyn AsRef<libc::aiocb>]
-        as *const [*const libc::aiocb] as *const *const libc::aiocb;
+    // Note that this allocation could be eliminated by making the argument
+    // generic, and accepting arguments like &[AioWrite].  But that would
+    // prevent using aio_suspend to wait on a heterogeneous list of mixed
+    // operations.
+    let v = list.iter()
+        .map(|x| x.as_ref() as *const libc::aiocb)
+        .collect::<Vec<*const libc::aiocb>>();
+    let p = v.as_ptr();
     let timep = match timeout {
         None => ptr::null::<libc::timespec>(),
         Some(x) => x.as_ref() as *const libc::timespec,
@@ -1172,6 +1178,7 @@ pub fn aio_suspend(
 /// // notification, we know that all operations are complete.
 /// assert_eq!(aiow.as_mut().aio_return().unwrap(), WBUF.len());
 /// ```
+#[deprecated(since = "0.27.0", note = "https://github.com/nix-rust/nix/issues/2017")]
 pub fn lio_listio(
     mode: LioMode,
     list: &mut [Pin<&mut dyn AsMut<libc::aiocb>>],