1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
|
Index: actix-http/Cargo.toml
===================================================================
--- actix-http.orig/Cargo.toml
+++ actix-http/Cargo.toml
@@ -218,7 +218,7 @@ version = "1"
version = "1"
[dependencies.derive_more]
-version = "2"
+version = ">= 1, < 3"
features = [
"as_ref",
"deref",
Index: actix-http/src/error.rs
===================================================================
--- actix-http.orig/src/error.rs
+++ actix-http/src/error.rs
@@ -2,7 +2,7 @@
use std::{error::Error as StdError, fmt, io, str::Utf8Error, string::FromUtf8Error};
-use derive_more::{Display, Error, From};
+use derive_more::{Display, Error as ErrorDerive, From};
pub use http::{status::InvalidStatusCode, Error as HttpError};
use http::{uri::InvalidUri, StatusCode};
@@ -156,7 +156,7 @@ impl From<crate::ws::ProtocolError> for
}
/// A set of errors that can occur during parsing HTTP streams.
-#[derive(Debug, Display, Error)]
+#[derive(Debug, Display, ErrorDerive)]
#[non_exhaustive]
pub enum ParseError {
/// An invalid `Method`, such as `GE.T`.
@@ -384,7 +384,7 @@ impl StdError for DispatchError {
}
/// A set of error that can occur during parsing content type.
-#[derive(Debug, Display, Error)]
+#[derive(Debug, Display, ErrorDerive)]
#[cfg_attr(test, derive(PartialEq, Eq))]
#[non_exhaustive]
pub enum ContentTypeError {
|
