Use new errors from ntex-http (#61)

Author: fafhrd91

.github/workflows/CI.yml

@@ -12,11 +12,6 @@ jobs:
     name: Check Style
     runs-on: ubuntu-latest
     steps:
-      - name: Free Disk Space
-        uses: jlumbroso/free-disk-space@main
-        with:
-          tool-cache: true
-
       - name: Checkout
         uses: actions/checkout@v1
 

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changes
 
+## [1.12.0] - 2025-07-08
+
+* Use new errors from ntex-http
+
 ## [1.11.0] - 2025-07-01
 
 * Allow to skip frames for unknown streams

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ntex-h2"
-version = "1.11.0"
+version = "1.12.0"
 license = "MIT OR Apache-2.0"
 authors = ["Nikolay Kim <[email protected]>"]
 description = "An HTTP/2 client and server"
@@ -25,7 +25,7 @@ features = []
 [dependencies]
 ntex-net = "2"
 ntex-io = "2.13"
-ntex-http = "0.1"
+ntex-http = "0.1.14"
 ntex-bytes = "0.1"
 ntex-codec = "0.6"
 ntex-service = "3.5"

src/client/mod.rs

@@ -1,4 +1,5 @@
 //! Http2 client
+use std::rc::Rc;
 
 mod connector;
 mod pool;
@@ -17,7 +18,7 @@ pub use self::stream::{RecvStream, SendStream};
 pub enum ClientError {
     /// Protocol error
     #[error("Protocol error: {0}")]
-    Protocol(Box<ConnectionError>),
+    Protocol(Rc<ConnectionError>),
     /// Operation error
     #[error("Operation error: {0}")]
     Operation(#[from] OperationError),
@@ -29,15 +30,15 @@ pub enum ClientError {
     HandshakeTimeout,
     /// Connect error
     #[error("Connect error: {0}")]
-    Connect(Box<ntex_net::connect::ConnectError>),
+    Connect(Rc<ntex_net::connect::ConnectError>),
     /// Peer disconnected
     #[error("Peer disconnected err: {0}")]
     Disconnected(#[from] std::io::Error),
 }
 
 impl From<ConnectionError> for ClientError {
     fn from(err: ConnectionError) -> Self {
-        Self::Protocol(Box::new(err))
+        Self::Protocol(Rc::new(err))
     }
 }
 
@@ -49,7 +50,7 @@ impl From<ntex_util::channel::Canceled> for ClientError {
 
 impl From<ntex_net::connect::ConnectError> for ClientError {
     fn from(err: ntex_net::connect::ConnectError) -> Self {
-        Self::Connect(Box::new(err))
+        Self::Connect(Rc::new(err))
     }
 }
 

src/hpack/decoder.rs

@@ -1,7 +1,7 @@
 use std::{cmp, collections::VecDeque, io::Cursor, str::Utf8Error};
 
 use ntex_bytes::{Buf, ByteString, Bytes, BytesMut};
-use ntex_http::{error, header, Method, StatusCode};
+use ntex_http::{compat, header, Method, StatusCode};
 
 use super::{huffman, Header};
 
@@ -578,41 +578,36 @@ impl Table {
 
 impl From<Utf8Error> for DecoderError {
     fn from(_: Utf8Error) -> DecoderError {
-        // TODO: Better error?
         DecoderError::InvalidUtf8
     }
 }
 
 impl From<()> for DecoderError {
     fn from(_: ()) -> DecoderError {
-        // TODO: Better error?
         DecoderError::InvalidUtf8
     }
 }
 
 impl From<header::InvalidHeaderValue> for DecoderError {
     fn from(_: header::InvalidHeaderValue) -> DecoderError {
-        // TODO: Better error?
         DecoderError::InvalidUtf8
     }
 }
 
 impl From<header::InvalidHeaderName> for DecoderError {
     fn from(_: header::InvalidHeaderName) -> DecoderError {
-        // TODO: Better error
         DecoderError::InvalidUtf8
     }
 }
 
-impl From<error::InvalidMethod> for DecoderError {
-    fn from(_: error::InvalidMethod) -> DecoderError {
-        // TODO: Better error
+impl From<compat::InvalidMethod> for DecoderError {
+    fn from(_: compat::InvalidMethod) -> DecoderError {
         DecoderError::InvalidUtf8
     }
 }
 
-impl From<error::InvalidStatusCode> for DecoderError {
-    fn from(_: error::InvalidStatusCode) -> DecoderError {
+impl From<compat::InvalidStatusCode> for DecoderError {
+    fn from(_: compat::InvalidStatusCode) -> DecoderError {
         // TODO: Better error
         DecoderError::InvalidUtf8
     }