Rename runtime to neon (#513)

ntex-net/Cargo.toml

@@ -25,7 +25,7 @@ tokio = ["ntex-rt/tokio", "ntex-tokio"]
 compio = ["ntex-rt/compio", "ntex-compio"]
 
 # default ntex runtime
-default-rt = ["ntex-rt/default-rt", "ntex-runtime", "ntex-iodriver", "slab", "socket2"]
+neon = ["ntex-rt/neon", "ntex-neon", "slab", "socket2"]
 
 [dependencies]
 ntex-service = "3.3"
@@ -37,8 +37,7 @@ ntex-util = "2.5"
 
 ntex-tokio = { version = "0.5.3", optional = true }
 ntex-compio = { version = "0.2.4", optional = true }
-ntex-runtime = { version = "0.1.0", optional = true }
-ntex-iodriver = { version = "0.1.0", optional = true }
+ntex-neon = { version = "0.1.0", optional = true }
 
 bitflags = { workspace = true }
 log = { workspace = true }

ntex-net/src/compat.rs

@@ -6,36 +6,24 @@ pub use ntex_tokio::{from_tcp_stream, tcp_connect, tcp_connect_in};
 #[cfg(all(unix, feature = "tokio"))]
 pub use ntex_tokio::{from_unix_stream, unix_connect, unix_connect_in};
 
-#[cfg(all(
-    feature = "default-rt",
-    not(feature = "tokio"),
-    not(feature = "compio")
-))]
+#[cfg(all(feature = "neon", not(feature = "tokio"), not(feature = "compio")))]
 pub use crate::rt::{
     from_tcp_stream, from_unix_stream, tcp_connect, tcp_connect_in, unix_connect,
     unix_connect_in,
 };
 
-#[cfg(all(
-    feature = "compio",
-    not(feature = "tokio"),
-    not(feature = "default-rt")
-))]
+#[cfg(all(feature = "compio", not(feature = "tokio"), not(feature = "neon")))]
 pub use ntex_compio::{from_tcp_stream, tcp_connect, tcp_connect_in};
 
 #[cfg(all(
     unix,
     feature = "compio",
     not(feature = "tokio"),
-    not(feature = "default-rt")
+    not(feature = "neon")
 ))]
 pub use ntex_compio::{from_unix_stream, unix_connect, unix_connect_in};
 
-#[cfg(all(
-    not(feature = "tokio"),
-    not(feature = "compio"),
-    not(feature = "default-rt")
-))]
+#[cfg(all(not(feature = "tokio"), not(feature = "compio"), not(feature = "neon")))]
 mod no_rt {
     use ntex_io::Io;
 
@@ -100,9 +88,5 @@ mod no_rt {
     }
 }
 
-#[cfg(all(
-    not(feature = "tokio"),
-    not(feature = "compio"),
-    not(feature = "default-rt")
-))]
+#[cfg(all(not(feature = "tokio"), not(feature = "compio"), not(feature = "neon")))]
 pub use no_rt::*;

ntex-net/src/lib.rs

@@ -9,9 +9,5 @@ pub use ntex_rt::{spawn, spawn_blocking};
 
 pub use self::compat::*;
 
-#[cfg(all(
-    feature = "default-rt",
-    not(feature = "tokio"),
-    not(feature = "compio")
-))]
+#[cfg(all(feature = "neon", not(feature = "tokio"), not(feature = "compio")))]
 mod rt;

ntex-net/src/rt/connect.rs

@@ -1,10 +1,10 @@
 use std::net::{Ipv4Addr, Ipv6Addr, SocketAddr, SocketAddrV4, SocketAddrV6};
 use std::{cell::RefCell, collections::VecDeque, io, path::Path, rc::Rc, task::Poll};
 
-use ntex_iodriver::op::{Handler, Interest};
-use ntex_iodriver::{syscall, AsRawFd, DriverApi, RawFd};
-use ntex_runtime::net::{Socket, TcpStream, UnixStream};
-use ntex_runtime::Runtime;
+use ntex_neon::driver::op::{Handler, Interest};
+use ntex_neon::driver::{AsRawFd, DriverApi, RawFd};
+use ntex_neon::net::{Socket, TcpStream, UnixStream};
+use ntex_neon::{syscall, Runtime};
 use ntex_util::channel::oneshot::{channel, Sender};
 use slab::Slab;
 use socket2::{Protocol, SockAddr, Type};

ntex-net/src/rt/driver.rs

@@ -1,8 +1,8 @@
 use std::{cell::Cell, collections::VecDeque, fmt, io, ptr, rc::Rc, task, task::Poll};
 
-use ntex_iodriver::op::{Handler, Interest};
-use ntex_iodriver::{syscall, AsRawFd, DriverApi, RawFd};
-use ntex_runtime::Runtime;
+use ntex_neon::driver::op::{Handler, Interest};
+use ntex_neon::driver::{AsRawFd, DriverApi, RawFd};
+use ntex_neon::{syscall, Runtime};
 use slab::Slab;
 
 use ntex_bytes::BufMut;

ntex-net/src/rt/io.rs

@@ -3,7 +3,7 @@ use std::{any, future::poll_fn, io, task::Poll};
 use ntex_io::{
     types, Handle, IoContext, IoStream, ReadContext, ReadStatus, WriteContext, WriteStatus,
 };
-use ntex_runtime::{net::TcpStream, net::UnixStream, spawn};
+use ntex_neon::{net::TcpStream, net::UnixStream, spawn};
 
 use super::driver::{Closable, CompioOps, StreamCtl};
 

ntex-net/src/rt/mod.rs

@@ -9,10 +9,10 @@ mod driver;
 mod io;
 
 /// Tcp stream wrapper for compio TcpStream
-struct TcpStream(ntex_runtime::net::TcpStream);
+struct TcpStream(ntex_neon::net::TcpStream);
 
 /// Tcp stream wrapper for compio UnixStream
-struct UnixStream(ntex_runtime::net::UnixStream);
+struct UnixStream(ntex_neon::net::UnixStream);
 
 /// Opens a TCP connection to a remote host.
 pub async fn tcp_connect(addr: SocketAddr) -> Result<Io> {
@@ -47,14 +47,14 @@ where
 /// Convert std TcpStream to tokio's TcpStream
 pub fn from_tcp_stream(stream: net::TcpStream) -> Result<Io> {
     stream.set_nodelay(true)?;
-    Ok(Io::new(TcpStream(ntex_runtime::net::TcpStream::from_std(
+    Ok(Io::new(TcpStream(ntex_neon::net::TcpStream::from_std(
         stream,
     )?)))
 }
 
 /// Convert std UnixStream to tokio's UnixStream
 pub fn from_unix_stream(stream: std::os::unix::net::UnixStream) -> Result<Io> {
-    Ok(Io::new(UnixStream(
-        ntex_runtime::net::UnixStream::from_std(stream)?,
-    )))
+    Ok(Io::new(UnixStream(ntex_neon::net::UnixStream::from_std(
+        stream,
+    )?)))
 }