io_uring: move fd utility helpers into crate

io-uring/src/lib.rs

@@ -63,9 +63,12 @@ macro_rules! map_err {
 }
 
 mod debounce;
+pub mod line_logger;
+pub mod object_drop_queue;
 mod ops;
 mod pending_result;
 mod sys;
+pub mod timer;
 
 #[derive(Debug, Error)]
 pub enum IoUringError {

io-uring/src/line_logger.rs

@@ -1,9 +1,6 @@
 use {
-    crate::{
+    crate::{IoUring, IoUringError},
-        io_uring::{IoUring, IoUringError},
+    jay_utils::{buf::Buf, vecdeque_ext::VecDequeExt},
-        utils::{buf::Buf, vecdeque_ext::VecDequeExt},
-    },
-    isnt::std_1::collections::IsntVecDequeExt,
     std::{collections::VecDeque, rc::Rc},
     uapi::OwnedFd,
 };
@@ -28,7 +25,7 @@ pub async fn log_lines(
             buf.drain(..=pos);
         }
     }
-    if buf.is_not_empty() {
+    if !buf.is_empty() {
         let (left, right) = buf.as_slices();
         f(left, right);
     }

io-uring/src/object_drop_queue.rs

@@ -1,8 +1,6 @@
 use {
-    crate::{
+    crate::{IoUring, PendingPoll, PollCallback},
-        io_uring::{IoUring, PendingPoll, PollCallback},
+    jay_utils::{errorfmt::ErrorFmt, oserror::OsError, stack::Stack},
-        utils::{errorfmt::ErrorFmt, oserror::OsError, stack::Stack},
-    },
     std::{
         cell::{Cell, RefCell},
         rc::Rc,

io-uring/src/timer.rs

@@ -1,10 +1,8 @@
 use {
-    crate::{
+    crate::{IoUring, IoUringError},
-        io_uring::{IoUring, IoUringError},
+    jay_utils::{
-        utils::{
+        buf::TypedBuf,
-            buf::TypedBuf,
+        oserror::{OsError, OsErrorExt2},
-            oserror::{OsError, OsErrorExt2},
-        },
     },
     std::{cell::RefCell, rc::Rc, time::Duration},
     thiserror::Error,

src/utils.rs

@@ -86,14 +86,20 @@ pub mod event_listener {
     }
 }
 pub mod linkedlist;
-pub mod line_logger;
+pub mod line_logger {
-pub mod object_drop_queue;
+    pub use jay_io_uring::line_logger::*;
+}
+pub mod object_drop_queue {
+    pub use jay_io_uring::object_drop_queue::*;
+}
 pub mod pending_serial;
 pub mod run_toplevel {
     pub use jay_async_engine::RunToplevel;
 }
 pub mod scroller;
-pub mod timer;
+pub mod timer {
+    pub use jay_io_uring::timer::*;
+}
 
 pub mod clonecell {
     pub use jay_utils::clonecell::*;