wip

Author: fafhrd91

ntex/src/client/error.rs

@@ -269,7 +269,7 @@ pub enum ClientError {
 impl Clone for ClientError {
     fn clone(&self) -> ClientError {
         match self {
-            ClientError::Url(err) => ClientError::Url(err.clone()),
+            ClientError::Url(err) => ClientError::Url(*err),
             ClientError::Connect(err) => ClientError::Connect(err.clone()),
             ClientError::Request(err) => ClientError::Request(err.clone()),
             ClientError::Response(err) => ClientError::Response(*err),

ntex/src/web/error.rs

@@ -1,8 +1,6 @@
 //! Web error
 use std::{cell::RefCell, fmt, io::Write, marker::PhantomData};
 
-use thiserror::Error;
-
 pub use ntex_http::error::Error as HttpError;
 pub use serde_json::error::Error as JsonError;
 #[cfg(feature = "url")]
@@ -78,14 +76,14 @@ where
 }
 
 /// Errors which can occur when attempting to work with `State` extractor
-#[derive(Error, Debug, Copy, Clone, PartialEq, Eq)]
+#[derive(Debug, Copy, Clone, PartialEq, Eq, thiserror::Error)]
 pub enum StateExtractorError {
     #[error("App state is not configured, to configure use App::state()")]
     NotConfigured,
 }
 
 /// Errors which can occur when attempting to generate resource uri.
-#[derive(Error, Debug, Copy, Clone, PartialEq, Eq)]
+#[derive(Debug, Copy, Clone, PartialEq, Eq, thiserror::Error)]
 pub enum UrlGenerationError {
     /// Resource not found
     #[error("Resource not found")]
@@ -100,7 +98,7 @@ pub enum UrlGenerationError {
 }
 
 /// A set of errors that can occur during parsing urlencoded payloads
-#[derive(Error, Debug)]
+#[derive(Debug, thiserror::Error)]
 pub enum UrlencodedError {
     /// Cannot decode chunked transfer encoding
     #[error("Cannot decode chunked transfer encoding")]
@@ -125,7 +123,7 @@ pub enum UrlencodedError {
 }
 
 /// A set of errors that can occur during parsing json payloads
-#[derive(Error, Debug)]
+#[derive(Debug, thiserror::Error)]
 pub enum JsonPayloadError {
     /// Payload size is bigger than allowed. (default: 32kB)
     #[error("Json payload size is bigger than allowed")]
@@ -142,22 +140,22 @@ pub enum JsonPayloadError {
 }
 
 /// A set of errors that can occur during parsing request paths
-#[derive(Error, Debug)]
+#[derive(Debug, thiserror::Error)]
 pub enum PathError {
     /// Deserialize error
     #[error("Path deserialize error: {0}")]
     Deserialize(#[from] serde::de::value::Error),
 }
 
 /// A set of errors that can occur during parsing query strings
-#[derive(Error, Debug)]
+#[derive(Debug, thiserror::Error)]
 pub enum QueryPayloadError {
     /// Deserialize error
     #[error("Query deserialize error: {0}")]
     Deserialize(#[from] serde::de::value::Error),
 }
 
-#[derive(Error, Debug)]
+#[derive(Debug, thiserror::Error)]
 pub enum PayloadError {
     /// Http error.
     #[error("{0:?}")]

ntex/src/ws/error.rs

@@ -1,16 +1,14 @@
 //! WebSocket protocol related errors.
 use std::io;
 
-use thiserror::Error;
-
 use crate::http::error::{DecodeError, EncodeError, HttpError, ResponseError};
 use crate::http::{Response, StatusCode, header::ALLOW, header::HeaderValue};
 use crate::{connect::ConnectError, util::Either, util::clone_io_error};
 
 use super::OpCode;
 
 /// Websocket service errors
-#[derive(Error, Debug)]
+#[derive(Debug, thiserror::Error)]
 pub enum WsError<E> {
     #[error("Service error")]
     Service(E),
@@ -29,7 +27,7 @@ pub enum WsError<E> {
 }
 
 /// Websocket protocol errors
-#[derive(Error, Copy, Clone, Debug)]
+#[derive(Copy, Clone, Debug, thiserror::Error)]
 pub enum ProtocolError {
     /// Received an unmasked frame from client
     #[error("Received an unmasked frame from client")]
@@ -61,7 +59,7 @@ pub enum ProtocolError {
 }
 
 /// Websocket client error
-#[derive(Error, Clone, Debug)]
+#[derive(Clone, Debug, thiserror::Error)]
 pub enum WsClientBuilderError<E> {
     #[error("Cannot create connector {0}")]
     Connector(E),
@@ -76,7 +74,7 @@ pub enum WsClientBuilderError<E> {
 }
 
 /// Websocket client error
-#[derive(Error, Debug)]
+#[derive(Debug, thiserror::Error)]
 pub enum WsClientError {
     /// Invalid request
     #[error("Invalid request")]
@@ -168,7 +166,7 @@ impl Clone for WsClientError {
 }
 
 /// Websocket handshake errors
-#[derive(Error, Copy, Clone, PartialEq, Eq, Debug)]
+#[derive(Copy, Clone, PartialEq, Eq, Debug, thiserror::Error)]
 pub enum HandshakeError {
     /// Only get method is allowed
     #[error("Method not allowed")]

ntex/tests/web_server.rs

@@ -5,7 +5,6 @@ use flate2::Compression;
 use flate2::read::GzDecoder;
 use flate2::write::{GzEncoder, ZlibDecoder, ZlibEncoder};
 use rand::{Rng, distr::Alphanumeric};
-use thiserror::Error;
 
 use ntex::http::header::{
     ACCEPT_ENCODING, CONTENT_ENCODING, CONTENT_LENGTH, CONTENT_TYPE, ContentEncoding,
@@ -801,11 +800,11 @@ async fn test_slow_request() {
 
 #[ntex::test]
 async fn test_custom_error() {
-    #[derive(Error, Debug)]
+    #[derive(Debug, thiserror::Error)]
     #[error("TestError")]
     struct TestError;
 
-    #[derive(Error, Debug)]
+    #[derive(Debug, thiserror::Error)]
     #[error("JsonContainer({0})")]
     struct JsonContainer(Box<dyn WebResponseError<JsonRenderer>>);