mirror of
https://github.com/fafhrd91/actix-web
synced 2024-12-04 20:31:55 +01:00
appease clippy by deriving Eq on a bunch of items (#2818)
This commit is contained in:
parent
8d260e599f
commit
6408291ab0
@ -2,7 +2,7 @@ use actix_web::{http::StatusCode, ResponseError};
|
|||||||
use derive_more::Display;
|
use derive_more::Display;
|
||||||
|
|
||||||
/// Errors which can occur when serving static files.
|
/// Errors which can occur when serving static files.
|
||||||
#[derive(Display, Debug, PartialEq)]
|
#[derive(Debug, PartialEq, Eq, Display)]
|
||||||
pub enum FilesError {
|
pub enum FilesError {
|
||||||
/// Path is not a directory
|
/// Path is not a directory
|
||||||
#[allow(dead_code)]
|
#[allow(dead_code)]
|
||||||
@ -22,7 +22,7 @@ impl ResponseError for FilesError {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[allow(clippy::enum_variant_names)]
|
#[allow(clippy::enum_variant_names)]
|
||||||
#[derive(Display, Debug, PartialEq)]
|
#[derive(Debug, PartialEq, Eq, Display)]
|
||||||
#[non_exhaustive]
|
#[non_exhaustive]
|
||||||
pub enum UriSegmentError {
|
pub enum UriSegmentError {
|
||||||
/// The segment started with the wrapped invalid character.
|
/// The segment started with the wrapped invalid character.
|
||||||
|
@ -388,7 +388,7 @@ impl StdError for DispatchError {
|
|||||||
|
|
||||||
/// A set of error that can occur during parsing content type.
|
/// A set of error that can occur during parsing content type.
|
||||||
#[derive(Debug, Display, Error)]
|
#[derive(Debug, Display, Error)]
|
||||||
#[cfg_attr(test, derive(PartialEq))]
|
#[cfg_attr(test, derive(PartialEq, Eq))]
|
||||||
#[non_exhaustive]
|
#[non_exhaustive]
|
||||||
pub enum ContentTypeError {
|
pub enum ContentTypeError {
|
||||||
/// Can not parse content type
|
/// Can not parse content type
|
||||||
|
@ -15,7 +15,7 @@ macro_rules! byte (
|
|||||||
})
|
})
|
||||||
);
|
);
|
||||||
|
|
||||||
#[derive(Debug, PartialEq, Clone)]
|
#[derive(Debug, Clone, PartialEq, Eq)]
|
||||||
pub(super) enum ChunkedState {
|
pub(super) enum ChunkedState {
|
||||||
Size,
|
Size,
|
||||||
SizeLws,
|
SizeLws,
|
||||||
|
@ -440,7 +440,7 @@ impl HeaderIndex {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, Clone, PartialEq)]
|
#[derive(Debug, Clone, PartialEq, Eq)]
|
||||||
/// Chunk type yielded while decoding a payload.
|
/// Chunk type yielded while decoding a payload.
|
||||||
pub enum PayloadItem {
|
pub enum PayloadItem {
|
||||||
Chunk(Bytes),
|
Chunk(Bytes),
|
||||||
@ -450,7 +450,7 @@ pub enum PayloadItem {
|
|||||||
/// Decoder that can handle different payload types.
|
/// Decoder that can handle different payload types.
|
||||||
///
|
///
|
||||||
/// If a message body does not use `Transfer-Encoding`, it should include a `Content-Length`.
|
/// If a message body does not use `Transfer-Encoding`, it should include a `Content-Length`.
|
||||||
#[derive(Debug, Clone, PartialEq)]
|
#[derive(Debug, Clone, PartialEq, Eq)]
|
||||||
pub struct PayloadDecoder {
|
pub struct PayloadDecoder {
|
||||||
kind: Kind,
|
kind: Kind,
|
||||||
}
|
}
|
||||||
@ -476,7 +476,7 @@ impl PayloadDecoder {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, Clone, PartialEq)]
|
#[derive(Debug, Clone, PartialEq, Eq)]
|
||||||
enum Kind {
|
enum Kind {
|
||||||
/// A reader used when a `Content-Length` header is passed with a positive integer.
|
/// A reader used when a `Content-Length` header is passed with a positive integer.
|
||||||
Length(u64),
|
Length(u64),
|
||||||
|
@ -16,7 +16,7 @@ use crate::error::PayloadError;
|
|||||||
/// max buffer size 32k
|
/// max buffer size 32k
|
||||||
pub(crate) const MAX_BUFFER_SIZE: usize = 32_768;
|
pub(crate) const MAX_BUFFER_SIZE: usize = 32_768;
|
||||||
|
|
||||||
#[derive(Debug, PartialEq)]
|
#[derive(Debug, PartialEq, Eq)]
|
||||||
pub enum PayloadStatus {
|
pub enum PayloadStatus {
|
||||||
Read,
|
Read,
|
||||||
Pause,
|
Pause,
|
||||||
|
@ -12,7 +12,7 @@ use crate::header::{Charset, HTTP_VALUE};
|
|||||||
/// - A character sequence representing the actual value (`value`), separated by single quotes.
|
/// - A character sequence representing the actual value (`value`), separated by single quotes.
|
||||||
///
|
///
|
||||||
/// It is defined in [RFC 5987 §3.2](https://datatracker.ietf.org/doc/html/rfc5987#section-3.2).
|
/// It is defined in [RFC 5987 §3.2](https://datatracker.ietf.org/doc/html/rfc5987#section-3.2).
|
||||||
#[derive(Clone, Debug, PartialEq)]
|
#[derive(Clone, Debug, PartialEq, Eq)]
|
||||||
pub struct ExtendedValue {
|
pub struct ExtendedValue {
|
||||||
/// The character set that is used to encode the `value` to a string.
|
/// The character set that is used to encode the `value` to a string.
|
||||||
pub charset: Charset,
|
pub charset: Charset,
|
||||||
|
@ -147,7 +147,7 @@ mod tests {
|
|||||||
|
|
||||||
// copy of encoding from actix-web headers
|
// copy of encoding from actix-web headers
|
||||||
#[allow(clippy::enum_variant_names)] // allow Encoding prefix on EncodingExt
|
#[allow(clippy::enum_variant_names)] // allow Encoding prefix on EncodingExt
|
||||||
#[derive(Clone, PartialEq, Debug)]
|
#[derive(Debug, Clone, PartialEq, Eq)]
|
||||||
pub enum Encoding {
|
pub enum Encoding {
|
||||||
Chunked,
|
Chunked,
|
||||||
Brotli,
|
Brotli,
|
||||||
|
@ -3,7 +3,7 @@ use std::{cell::RefCell, ops, rc::Rc};
|
|||||||
use bitflags::bitflags;
|
use bitflags::bitflags;
|
||||||
|
|
||||||
/// Represents various types of connection
|
/// Represents various types of connection
|
||||||
#[derive(Copy, Clone, PartialEq, Debug)]
|
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
||||||
pub enum ConnectionType {
|
pub enum ConnectionType {
|
||||||
/// Close connection after response.
|
/// Close connection after response.
|
||||||
Close,
|
Close,
|
||||||
|
@ -11,7 +11,7 @@ use super::{
|
|||||||
};
|
};
|
||||||
|
|
||||||
/// A WebSocket message.
|
/// A WebSocket message.
|
||||||
#[derive(Debug, PartialEq)]
|
#[derive(Debug, PartialEq, Eq)]
|
||||||
pub enum Message {
|
pub enum Message {
|
||||||
/// Text message.
|
/// Text message.
|
||||||
Text(ByteString),
|
Text(ByteString),
|
||||||
@ -36,7 +36,7 @@ pub enum Message {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// A WebSocket frame.
|
/// A WebSocket frame.
|
||||||
#[derive(Debug, PartialEq)]
|
#[derive(Debug, PartialEq, Eq)]
|
||||||
pub enum Frame {
|
pub enum Frame {
|
||||||
/// Text frame. Note that the codec does not validate UTF-8 encoding.
|
/// Text frame. Note that the codec does not validate UTF-8 encoding.
|
||||||
Text(Bytes),
|
Text(Bytes),
|
||||||
@ -58,7 +58,7 @@ pub enum Frame {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// A WebSocket continuation item.
|
/// A WebSocket continuation item.
|
||||||
#[derive(Debug, PartialEq)]
|
#[derive(Debug, PartialEq, Eq)]
|
||||||
pub enum Item {
|
pub enum Item {
|
||||||
FirstText(Bytes),
|
FirstText(Bytes),
|
||||||
FirstBinary(Bytes),
|
FirstBinary(Bytes),
|
||||||
|
@ -67,7 +67,7 @@ pub enum ProtocolError {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// WebSocket handshake errors
|
/// WebSocket handshake errors
|
||||||
#[derive(Debug, Clone, Copy, PartialEq, Display, Error)]
|
#[derive(Debug, Clone, Copy, PartialEq, Eq, Display, Error)]
|
||||||
pub enum HandshakeError {
|
pub enum HandshakeError {
|
||||||
/// Only get method is allowed.
|
/// Only get method is allowed.
|
||||||
#[display(fmt = "Method not allowed.")]
|
#[display(fmt = "Method not allowed.")]
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
use crate::{IntoPatterns, Resource, ResourceDef};
|
use crate::{IntoPatterns, Resource, ResourceDef};
|
||||||
|
|
||||||
#[derive(Debug, Copy, Clone, PartialEq)]
|
#[derive(Debug, Copy, Clone, PartialEq, Eq)]
|
||||||
pub struct ResourceId(pub u16);
|
pub struct ResourceId(pub u16);
|
||||||
|
|
||||||
/// Resource router.
|
/// Resource router.
|
||||||
|
@ -42,7 +42,7 @@ pub struct BlockingError;
|
|||||||
impl ResponseError for crate::error::BlockingError {}
|
impl ResponseError for crate::error::BlockingError {}
|
||||||
|
|
||||||
/// Errors which can occur when attempting to generate resource uri.
|
/// Errors which can occur when attempting to generate resource uri.
|
||||||
#[derive(Debug, PartialEq, Display, Error, From)]
|
#[derive(Debug, PartialEq, Eq, Display, Error, From)]
|
||||||
#[non_exhaustive]
|
#[non_exhaustive]
|
||||||
pub enum UrlGenerationError {
|
pub enum UrlGenerationError {
|
||||||
/// Resource not found.
|
/// Resource not found.
|
||||||
|
@ -37,7 +37,7 @@ fn split_once_and_trim(haystack: &str, needle: char) -> (&str, &str) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// The implied disposition of the content of the HTTP body.
|
/// The implied disposition of the content of the HTTP body.
|
||||||
#[derive(Clone, Debug, PartialEq)]
|
#[derive(Debug, Clone, PartialEq, Eq)]
|
||||||
pub enum DispositionType {
|
pub enum DispositionType {
|
||||||
/// Inline implies default processing.
|
/// Inline implies default processing.
|
||||||
Inline,
|
Inline,
|
||||||
@ -79,7 +79,7 @@ impl<'a> From<&'a str> for DispositionType {
|
|||||||
/// assert!(param.is_filename());
|
/// assert!(param.is_filename());
|
||||||
/// assert_eq!(param.as_filename().unwrap(), "sample.txt");
|
/// assert_eq!(param.as_filename().unwrap(), "sample.txt");
|
||||||
/// ```
|
/// ```
|
||||||
#[derive(Clone, Debug, PartialEq)]
|
#[derive(Clone, Debug, PartialEq, Eq)]
|
||||||
#[allow(clippy::large_enum_variant)]
|
#[allow(clippy::large_enum_variant)]
|
||||||
pub enum DispositionParam {
|
pub enum DispositionParam {
|
||||||
/// For [`DispositionType::FormData`] (i.e. *multipart/form-data*), the name of an field from
|
/// For [`DispositionType::FormData`] (i.e. *multipart/form-data*), the name of an field from
|
||||||
@ -302,7 +302,7 @@ impl DispositionParam {
|
|||||||
/// change to match local file system conventions if applicable, and do not use directory path
|
/// change to match local file system conventions if applicable, and do not use directory path
|
||||||
/// information that may be present.
|
/// information that may be present.
|
||||||
/// See [RFC 2183 §2.3](https://datatracker.ietf.org/doc/html/rfc2183#section-2.3).
|
/// See [RFC 2183 §2.3](https://datatracker.ietf.org/doc/html/rfc2183#section-2.3).
|
||||||
#[derive(Clone, Debug, PartialEq)]
|
#[derive(Clone, Debug, PartialEq, Eq)]
|
||||||
pub struct ContentDisposition {
|
pub struct ContentDisposition {
|
||||||
/// The disposition type
|
/// The disposition type
|
||||||
pub disposition: DispositionType,
|
pub disposition: DispositionType,
|
||||||
|
@ -57,7 +57,7 @@ use crate::HttpMessage;
|
|||||||
/// IfRange::Date(fetched.into())
|
/// IfRange::Date(fetched.into())
|
||||||
/// );
|
/// );
|
||||||
/// ```
|
/// ```
|
||||||
#[derive(Clone, Debug, PartialEq)]
|
#[derive(Clone, Debug, PartialEq, Eq)]
|
||||||
pub enum IfRange {
|
pub enum IfRange {
|
||||||
/// The entity-tag the client has of the resource.
|
/// The entity-tag the client has of the resource.
|
||||||
EntityTag(EntityTag),
|
EntityTag(EntityTag),
|
||||||
|
@ -224,10 +224,11 @@ macro_rules! common_header {
|
|||||||
// List header, one or more items with "*" option
|
// List header, one or more items with "*" option
|
||||||
($(#[$attrs:meta])*($id:ident, $name:expr) => {Any / ($item:ty)+}) => {
|
($(#[$attrs:meta])*($id:ident, $name:expr) => {Any / ($item:ty)+}) => {
|
||||||
$(#[$attrs])*
|
$(#[$attrs])*
|
||||||
#[derive(Clone, Debug, PartialEq)]
|
#[derive(Clone, Debug, PartialEq, Eq)]
|
||||||
pub enum $id {
|
pub enum $id {
|
||||||
/// Any value is a match
|
/// Any value is a match
|
||||||
Any,
|
Any,
|
||||||
|
|
||||||
/// Only the listed items are a match
|
/// Only the listed items are a match
|
||||||
Items(Vec<$item>),
|
Items(Vec<$item>),
|
||||||
}
|
}
|
||||||
|
@ -53,7 +53,7 @@ use super::{Header, HeaderName, HeaderValue, InvalidHeaderValue, TryIntoHeaderVa
|
|||||||
/// builder.insert_header(Range::bytes(1, 100));
|
/// builder.insert_header(Range::bytes(1, 100));
|
||||||
/// builder.insert_header(Range::bytes_multi(vec![(1, 100), (200, 300)]));
|
/// builder.insert_header(Range::bytes_multi(vec![(1, 100), (200, 300)]));
|
||||||
/// ```
|
/// ```
|
||||||
#[derive(PartialEq, Clone, Debug)]
|
#[derive(Debug, Clone, PartialEq, Eq)]
|
||||||
pub enum Range {
|
pub enum Range {
|
||||||
/// Byte range.
|
/// Byte range.
|
||||||
Bytes(Vec<ByteRangeSpec>),
|
Bytes(Vec<ByteRangeSpec>),
|
||||||
|
@ -73,7 +73,7 @@ use crate::{
|
|||||||
/// }
|
/// }
|
||||||
/// }
|
/// }
|
||||||
/// ```
|
/// ```
|
||||||
#[derive(Debug, PartialEq)]
|
#[derive(Debug, PartialEq, Eq)]
|
||||||
pub enum Either<L, R> {
|
pub enum Either<L, R> {
|
||||||
/// A value of type `L`.
|
/// A value of type `L`.
|
||||||
Left(L),
|
Left(L),
|
||||||
|
Loading…
Reference in New Issue
Block a user