Use a10::io::Std{io,out,err}

Fixes the leaking of a10::SubmissionQueue. Also avoids the use of some unsafe.
Thomasdezeeuw · Jul 12, 2023 · 3f818a6 · 3f818a6
1 parent 1105b96
commit 3f818a6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/rt/Cargo.toml b/rt/Cargo.toml
@@ -18,7 +18,7 @@ edition       = "2021"
 test = ["heph/test"]
 
 [dependencies]
-a10               = { version = "0.1.0", default-features = false, features = ["nightly"] }
+a10               = { version = "0.1.1", default-features = false, features = ["nightly"] }
 heph              = { version = "0.5.0", path = "../", default-features = false }
 heph-inbox        = { version = "0.2.3", path = "../inbox", default-features = false }
 log               = { version = "0.4.17", default-features = false, features = ["kv_unstable", "kv_unstable_std"] }

diff --git a/rt/src/io/mod.rs b/rt/src/io/mod.rs
@@ -67,9 +67,7 @@ macro_rules! stdio {
     ) => {
         #[doc = concat!("Create a new `", stringify!($name), "`.\n\n")]
         pub fn $fn<RT: Access>(rt: &RT) -> $name {
-            let fd = std::mem::ManuallyDrop::new(unsafe {
-                a10::AsyncFd::from_raw_fd($fd, rt.submission_queue())
-            });
+            let fd = a10::io::$fn(rt.submission_queue());
             $name { fd }
         }
 
@@ -81,7 +79,7 @@ macro_rules! stdio {
         )]
         #[derive(Debug)]
         pub struct $name {
-            fd: std::mem::ManuallyDrop<a10::AsyncFd>,
+            fd: a10::io::$name,
         }
     };
 }