Refactor neon and neon-uring drivers (#696)

Author: fafhrd91

.github/workflows/cov.yml

@@ -9,8 +9,11 @@ jobs:
       CARGO_TERM_COLOR: always
     steps:
       - uses: actions/checkout@v4
+      - uses: taiki-e/install-action@nextest
+
       - name: Install Rust
         run: rustup update nightly
+
       - name: Install cargo-llvm-cov
         uses: taiki-e/install-action@cargo-llvm-cov
 
@@ -26,16 +29,16 @@ jobs:
         run: cargo llvm-cov clean --workspace
 
       - name: Code coverage (neon)
-        run: cargo llvm-cov --no-report --all --no-default-features --features="ntex/neon,ntex/cookie,ntex/url,ntex/compress,ntex/openssl,ntex/rustls,ntex/ws"
+        run: cargo llvm-cov nextest --retries=3 --no-report --all --no-default-features --features="ntex/neon,ntex/cookie,ntex/url,ntex/compress,ntex/openssl,ntex/rustls,ntex/ws"
 
       - name: Code coverage (neon-uring)
-        run: cargo llvm-cov --no-report --all --no-default-features --features="ntex/neon-uring,ntex/cookie,ntex/url,ntex/compress,ntex/openssl,ntex/rustls,ntex/ws"
+        run: cargo llvm-cov nextest --retries=3 --no-report --all --no-default-features --features="ntex/neon-uring,ntex/cookie,ntex/url,ntex/compress,ntex/openssl,ntex/rustls,ntex/ws"
 
       - name: Code coverage (tokio)
-        run: cargo llvm-cov --no-report --all --no-default-features --features="ntex/tokio,ntex/cookie,ntex/url,ntex/compress,ntex/openssl,ntex/rustls,ntex/ws"
+        run: cargo llvm-cov nextest --retries=3 --no-report --all --no-default-features --features="ntex/tokio,ntex/cookie,ntex/url,ntex/compress,ntex/openssl,ntex/rustls,ntex/ws"
 
       - name: Code coverage (compio)
-        run: cargo llvm-cov --no-report --all --no-default-features --features="ntex/compio,ntex/cookie,ntex/url,ntex/compress,ntex/openssl,ntex/rustls,ntex/ws"
+        run: cargo llvm-cov nextest --retries=3 --no-report --all --no-default-features --features="ntex/compio,ntex/cookie,ntex/url,ntex/compress,ntex/openssl,ntex/rustls,ntex/ws"
 
       - name: Generate coverage report
         run: cargo llvm-cov report --lcov --output-path lcov.info --ignore-filename-regex="ntex-compio|ntex-tokio"

.github/workflows/linux.yml

@@ -17,6 +17,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
+      - uses: taiki-e/install-action@nextest
 
       - name: Install ${{ matrix.version }}
         uses: actions-rust-lang/setup-rust-toolchain@v1
@@ -34,20 +35,20 @@ jobs:
       - name: Run tests (neon)
         timeout-minutes: 15
         run: |
-          cargo test --all --no-default-features --features="ntex/neon,ntex/cookie,ntex/url,ntex/compress,ntex/openssl,ntex/rustls,ntex/ws"
+          cargo nextest run --retries=3 --all --no-default-features --features="ntex/neon,ntex/cookie,ntex/url,ntex/compress,ntex/openssl,ntex/rustls,ntex/ws"
 
       - name: Run tests (neon-uring)
         timeout-minutes: 15
         run: |
-          cargo test --all --no-default-features --features="ntex/neon-uring,ntex/cookie,ntex/url,ntex/compress,ntex/openssl,ntex/rustls,ntex/ws"
+          cargo nextest run --retries=3 --all --no-default-features --features="ntex/neon-uring,ntex/cookie,ntex/url,ntex/compress,ntex/openssl,ntex/rustls,ntex/ws"
 
       - name: Run tests (tokio)
         timeout-minutes: 15
         run: |
-          cargo test --all --no-default-features --features="ntex/tokio,ntex/cookie,ntex/url,ntex/compress,ntex/openssl,ntex/rustls,ntex/ws"
+          cargo nextest run --retries=3 --all --no-default-features --features="ntex/tokio,ntex/cookie,ntex/url,ntex/compress,ntex/openssl,ntex/rustls,ntex/ws"
 
       - name: Run tests (compio)
         timeout-minutes: 15
         if: matrix.version != '1.85.0'
         run: |
-          cargo test --all --no-default-features --features="ntex/compio,ntex/cookie,ntex/url,ntex/compress,ntex/openssl,ntex/rustls,ntex/ws"
+          cargo nextest run --retries=3 --all --no-default-features --features="ntex/compio,ntex/cookie,ntex/url,ntex/compress,ntex/openssl,ntex/rustls,ntex/ws"

.github/workflows/osx.yml

@@ -16,6 +16,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
+      - uses: taiki-e/install-action@nextest
 
       - name: Install ${{ matrix.version }}
         uses: actions-rust-lang/setup-rust-toolchain@v1
@@ -31,8 +32,15 @@ jobs:
         uses: Swatinem/rust-cache@v1.0.1
 
       - name: Run tests (neon)
-        timeout-minutes: 40
-        run: cargo test --all --no-default-features --no-fail-fast --features="ntex/neon,ntex/cookie,ntex/url,ntex/compress,ntex/openssl,ntex/rustls,ntex/ws"
+        timeout-minutes: 15
+        run: cargo nextest run --retries=3 --all --no-default-features --no-fail-fast --features="ntex/neon,ntex/cookie,ntex/url,ntex/compress,ntex/openssl,ntex/rustls,ntex/ws"
 
       - name: Run tests (tokio)
-        run: cargo test --all --no-default-features --no-fail-fast --features="ntex/tokio,ntex/cookie,ntex/url,ntex/compress,ntex/openssl,ntex/rustls,ntex/ws"
+        timeout-minutes: 15
+        run: cargo nextest run --retries=3 --all --no-default-features --no-fail-fast --features="ntex/tokio,ntex/cookie,ntex/url,ntex/compress,ntex/openssl,ntex/rustls,ntex/ws"
+
+      - name: Run tests (compio)
+        timeout-minutes: 15
+        if: matrix.version != '1.85.0'
+        run: |
+          cargo nextest run --retries=3 --all --no-default-features --features="ntex/compio,ntex/cookie,ntex/url,ntex/compress,ntex/openssl,ntex/rustls,ntex/ws"

.github/workflows/windows.yml

@@ -19,6 +19,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
+      - uses: taiki-e/install-action@nextest
 
       - name: Install ${{ matrix.version }}
         uses: actions-rust-lang/setup-rust-toolchain@v1
@@ -75,8 +76,8 @@ jobs:
 
       - name: Run tests (tokio)
         run: |
-          cargo test --all --no-default-features --no-fail-fast --features="ntex/tokio,ntex/cookie,ntex/url,ntex/compress,ntex/openssl,ntex/rustls,ntex/ws" -- --skip test_timer
+          cargo nextest run --retries=3 --all --no-default-features --no-fail-fast --features="ntex/tokio,ntex/cookie,ntex/url,ntex/compress,ntex/openssl,ntex/rustls,ntex/ws" -- --skip test_timer
 
       - name: Run tests (compio)
         run: |
-          cargo test --all --no-default-features --no-fail-fast --features="ntex/compio,ntex/cookie,ntex/url,ntex/compress,ntex/openssl,ntex/rustls,ntex/ws" -- --skip test_timer
+          cargo nextest run --retries=3 --all --no-default-features --no-fail-fast --features="ntex/compio,ntex/cookie,ntex/url,ntex/compress,ntex/openssl,ntex/rustls,ntex/ws" -- --skip test_timer

Cargo.toml

@@ -90,7 +90,7 @@ serde_json = "1"
 serde_urlencoded = "0.7"
 sha1 = "0.10"
 slab = "0.4.9"
-socket2 = "0.5.6"
+socket2 = "0.6.1"
 variadics_please = "1.1"
 windows-sys = "0.52.0"
 time = "0.3"

ntex-net/CHANGES.md

@@ -1,5 +1,9 @@
 # Changes
 
+## [3.3.1] - 2025-12-16
+
+* Refactor neon and neon-uring drivers
+
 ## [3.3.0] - 2025-12-15
 
 * Drop all sockets on driver drop for neon driver

ntex-net/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ntex-net"
-version = "3.3.0"
+version = "3.3.1"
 authors = ["ntex contributors <team@ntex.rs>"]
 description = "ntexwork utils for ntex framework"
 keywords = ["network", "framework", "async", "futures"]
@@ -32,16 +32,16 @@ io-uring = ["ntex-neon/io-uring", "socket2"]
 io-uring-compat = []
 
 [dependencies]
-ntex-service = "3.7"
+ntex-service = "3.8"
 ntex-bytes = "1"
 ntex-http = "1"
 ntex-io = "3"
 ntex-rt = "3.3"
 ntex-util = "3"
 
 ntex-tokio = { version = "3.0.0", optional = true }
-ntex-compio = { version = "3.2.1", optional = true }
-ntex-neon = { version = "0.2.1", optional = true }
+ntex-compio = { version = "3.3.0", optional = true }
+ntex-neon = { version = "0.2.2", optional = true }
 
 bitflags = { workspace = true }
 cfg-if = { workspace = true }
@@ -52,5 +52,5 @@ socket2 = { workspace = true, optional = true, features = ["all"] }
 thiserror = { workspace = true }
 
 [dev-dependencies]
-ntex = "3.0.0-pre.6"
+ntex = "3.0.0-pre.7"
 oneshot = "0.1"

ntex-net/src/rt_polling/connect.rs

@@ -58,8 +58,9 @@ impl ConnectOps {
         addr: SockAddr,
         sender: Sender<io::Result<Socket>>,
     ) -> io::Result<usize> {
-        let result =
-            syscall!(break libc::connect(sock.as_raw_fd(), addr.as_ptr(), addr.len()))?;
+        let result = syscall!(
+            break libc::connect(sock.as_raw_fd(), addr.as_ptr().cast(), addr.len())
+        )?;
         let fd = sock.as_raw_fd();
         let item = Item { sock, sender };
         let id = self.0.connects.borrow_mut().insert(item);
@@ -129,6 +130,8 @@ impl Handler for ConnectOpsBatcher {
         }
     }
 
+    fn tick(&mut self) {}
+
     fn cleanup(&mut self) {
         self.inner.connects.borrow_mut().clear();
     }