build(deps): update derive_more requirement from 1 to 2 (#3571)

* build(deps): update derive_more requirement from 1 to 2

Updates the requirements on [derive_more](https://github.com/JelteF/derive_more) to permit the latest version.
- [Release notes](https://github.com/JelteF/derive_more/releases)
- [Changelog](https://github.com/JelteF/derive_more/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JelteF/derive_more/compare/v1.0.0...v2.0.1)

---
updated-dependencies:
- dependency-name: derive_more
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

* refactor: simplify derive_more calls

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Rob Ede <robjtede@icloud.com>

.github/workflows/ci-post-merge.yml

@@ -49,7 +49,7 @@ jobs:
           toolchain: ${{ matrix.version.version }}
 
       - name: Install just, cargo-hack, cargo-nextest, cargo-ci-cache-clean
-        uses: taiki-e/install-action@v2.48.1
+        uses: taiki-e/install-action@v2.48.4
         with:
           tool: just,cargo-hack,cargo-nextest,cargo-ci-cache-clean
 
@@ -83,7 +83,7 @@ jobs:
         uses: actions-rust-lang/setup-rust-toolchain@v1.10.1
 
       - name: Install just, cargo-hack
-        uses: taiki-e/install-action@v2.48.1
+        uses: taiki-e/install-action@v2.48.4
         with:
           tool: just,cargo-hack
 

.github/workflows/ci.yml

@@ -64,7 +64,7 @@ jobs:
           toolchain: ${{ matrix.version.version }}
 
       - name: Install just, cargo-hack, cargo-nextest, cargo-ci-cache-clean
-        uses: taiki-e/install-action@v2.48.1
+        uses: taiki-e/install-action@v2.48.4
         with:
           tool: just,cargo-hack,cargo-nextest,cargo-ci-cache-clean
 
@@ -113,7 +113,7 @@ jobs:
           toolchain: nightly
 
       - name: Install just
-        uses: taiki-e/install-action@v2.48.1
+        uses: taiki-e/install-action@v2.48.4
         with:
           tool: just
 

.github/workflows/coverage.yml

@@ -24,7 +24,7 @@ jobs:
           components: llvm-tools
 
       - name: Install just, cargo-llvm-cov, cargo-nextest
-        uses: taiki-e/install-action@v2.48.1
+        uses: taiki-e/install-action@v2.48.4
         with:
           tool: just,cargo-llvm-cov,cargo-nextest
 

.github/workflows/lint.yml

@@ -77,12 +77,12 @@ jobs:
           toolchain: ${{ vars.RUST_VERSION_EXTERNAL_TYPES }}
 
       - name: Install just
-        uses: taiki-e/install-action@v2.48.1
+        uses: taiki-e/install-action@v2.48.4
         with:
           tool: just
 
       - name: Install cargo-check-external-types
-        uses: taiki-e/cache-cargo-install-action@v2.1.0
+        uses: taiki-e/cache-cargo-install-action@v2.1.1
         with:
           tool: cargo-check-external-types
 

actix-files/Cargo.toml

@@ -33,7 +33,7 @@ actix-web = { version = "4", default-features = false }
 
 bitflags = "2"
 bytes = "1"
-derive_more = { version = "1", features = ["display", "error", "from"] }
+derive_more = { version = "2", features = ["display", "error", "from"] }
 futures-core = { version = "0.3.17", default-features = false, features = ["alloc"] }
 http-range = "0.1.4"
 log = "0.4"

actix-files/src/error.rs

@@ -1,5 +1,5 @@
 use actix_web::{http::StatusCode, ResponseError};
-use derive_more::derive::Display;
+use derive_more::Display;
 
 /// Errors which can occur when serving static files.
 #[derive(Debug, PartialEq, Eq, Display)]

actix-files/src/named.rs

@@ -21,7 +21,7 @@ use actix_web::{
     Error, HttpMessage, HttpRequest, HttpResponse, Responder,
 };
 use bitflags::bitflags;
-use derive_more::derive::{Deref, DerefMut};
+use derive_more::{Deref, DerefMut};
 use futures_core::future::LocalBoxFuture;
 use mime::Mime;
 

actix-files/src/range.rs

@@ -1,6 +1,6 @@
 use std::fmt;
 
-use derive_more::derive::Error;
+use derive_more::Error;
 
 /// Copy of `http_range::HttpRangeParseError`.
 #[derive(Debug, Clone)]

actix-http/CHANGES.md

@@ -5,6 +5,7 @@
 ### Added
 
 - Add `header::CLEAR_SITE_DATA` constant.
+- Add `Extensions::get_or_insert[_with]()` methods.
 
 ### Changed
 

actix-http/Cargo.toml

@@ -109,7 +109,7 @@ actix-rt = { version = "2.2", default-features = false }
 bitflags = "2"
 bytes = "1"
 bytestring = "1"
-derive_more = { version = "1", features = ["as_ref", "deref", "deref_mut", "display", "error", "from"] }
+derive_more = { version = "2", features = ["as_ref", "deref", "deref_mut", "display", "error", "from"] }
 encoding_rs = "0.8"
 foldhash = "0.1"
 futures-core = { version = "0.3.17", default-features = false, features = ["alloc"] }

actix-http/src/body/body_stream.rs

@@ -75,7 +75,7 @@ mod tests {
         time::{sleep, Sleep},
     };
     use actix_utils::future::poll_fn;
-    use derive_more::derive::{Display, Error};
+    use derive_more::{Display, Error};
     use futures_core::ready;
     use futures_util::{stream, FutureExt as _};
     use pin_project_lite::pin_project;

actix-http/src/body/utils.rs

@@ -3,7 +3,7 @@ use std::task::Poll;
 use actix_rt::pin;
 use actix_utils::future::poll_fn;
 use bytes::{Bytes, BytesMut};
-use derive_more::derive::{Display, Error};
+use derive_more::{Display, Error};
 use futures_core::ready;
 
 use super::{BodySize, MessageBody};

actix-http/src/encoding/encoder.rs

@@ -10,7 +10,7 @@ use std::{
 
 use actix_rt::task::{spawn_blocking, JoinHandle};
 use bytes::Bytes;
-use derive_more::derive::Display;
+use derive_more::Display;
 #[cfg(feature = "compress-gzip")]
 use flate2::write::{GzEncoder, ZlibEncoder};
 use futures_core::ready;

actix-http/src/error.rs

@@ -2,7 +2,7 @@
 
 use std::{error::Error as StdError, fmt, io, str::Utf8Error, string::FromUtf8Error};
 
-use derive_more::derive::{Display, Error, From};
+use derive_more::{Display, Error, From};
 pub use http::{status::InvalidStatusCode, Error as HttpError};
 use http::{uri::InvalidUri, StatusCode};
 

actix-http/src/extensions.rs

@@ -104,6 +104,46 @@ impl Extensions {
             .and_then(|boxed| boxed.downcast_mut())
     }
 
+    /// Inserts the given `value` into the extensions if it is not present, then returns a reference
+    /// to the value in the extensions.
+    ///
+    /// ```
+    /// # use actix_http::Extensions;
+    /// let mut map = Extensions::new();
+    /// assert_eq!(map.get::<Vec<u32>>(), None);
+    ///
+    /// map.get_or_insert(Vec::<u32>::new()).push(1);
+    /// assert_eq!(map.get::<Vec<u32>>(), Some(&vec![1]));
+    ///
+    /// map.get_or_insert(Vec::<u32>::new()).push(2);
+    /// assert_eq!(map.get::<Vec<u32>>(), Some(&vec![1,2]));
+    /// ```
+    pub fn get_or_insert<T: 'static>(&mut self, value: T) -> &mut T {
+        self.get_or_insert_with(|| value)
+    }
+
+    /// Inserts a value computed from `f` into the extensions if the given `value` is not present,
+    /// then returns a reference to the value in the extensions.
+    ///
+    /// ```
+    /// # use actix_http::Extensions;
+    /// let mut map = Extensions::new();
+    /// assert_eq!(map.get::<Vec<u32>>(), None);
+    ///
+    /// map.get_or_insert_with(Vec::<u32>::new).push(1);
+    /// assert_eq!(map.get::<Vec<u32>>(), Some(&vec![1]));
+    ///
+    /// map.get_or_insert_with(Vec::<u32>::new).push(2);
+    /// assert_eq!(map.get::<Vec<u32>>(), Some(&vec![1,2]));
+    /// ```
+    pub fn get_or_insert_with<T: 'static, F: FnOnce() -> T>(&mut self, default: F) -> &mut T {
+        self.map
+            .entry(TypeId::of::<T>())
+            .or_insert_with(|| Box::new(default()))
+            .downcast_mut()
+            .expect("extensions map should now contain a T value")
+    }
+
     /// Remove an item from the map of a given type.
     ///
     /// If an item of this type was already stored, it will be returned.

actix-http/src/header/shared/content_encoding.rs

@@ -1,6 +1,6 @@
 use std::str::FromStr;
 
-use derive_more::derive::{Display, Error};
+use derive_more::{Display, Error};
 use http::header::InvalidHeaderValue;
 
 use crate::{

actix-http/src/header/shared/quality.rs

@@ -1,6 +1,6 @@
 use std::fmt;
 
-use derive_more::derive::{Display, Error};
+use derive_more::{Display, Error};
 
 const MAX_QUALITY_INT: u16 = 1000;
 const MAX_QUALITY_FLOAT: f32 = 1.0;

actix-http/src/ws/mod.rs

@@ -5,7 +5,7 @@
 
 use std::io;
 
-use derive_more::derive::{Display, Error, From};
+use derive_more::{Display, Error, From};
 use http::{header, Method, StatusCode};
 
 use crate::{body::BoxBody, header::HeaderValue, RequestHead, Response, ResponseBuilder};

actix-http/tests/test_client.rs

@@ -5,7 +5,7 @@ use actix_http_test::test_server;
 use actix_service::ServiceFactoryExt;
 use actix_utils::future;
 use bytes::Bytes;
-use derive_more::derive::{Display, Error};
+use derive_more::{Display, Error};
 use futures_util::StreamExt as _;
 
 const STR: &str = "Hello World Hello World Hello World Hello World Hello World \

actix-http/tests/test_openssl.rs

@@ -14,7 +14,7 @@ use actix_http_test::test_server;
 use actix_service::{fn_service, ServiceFactoryExt};
 use actix_utils::future::{err, ok, ready};
 use bytes::{Bytes, BytesMut};
-use derive_more::derive::{Display, Error};
+use derive_more::{Display, Error};
 use futures_core::Stream;
 use futures_util::{stream::once, StreamExt as _};
 use openssl::{

actix-http/tests/test_rustls.rs

@@ -23,7 +23,7 @@ use actix_service::{fn_factory_with_config, fn_service};
 use actix_tls::connect::rustls_0_23::webpki_roots_cert_store;
 use actix_utils::future::{err, ok, poll_fn};
 use bytes::{Bytes, BytesMut};
-use derive_more::derive::{Display, Error};
+use derive_more::{Display, Error};
 use futures_core::{ready, Stream};
 use futures_util::stream::once;
 use rustls::{pki_types::ServerName, ServerConfig as RustlsServerConfig};

actix-http/tests/test_server.rs

@@ -14,7 +14,7 @@ use actix_rt::{net::TcpStream, time::sleep};
 use actix_service::fn_service;
 use actix_utils::future::{err, ok, ready};
 use bytes::Bytes;
-use derive_more::derive::{Display, Error};
+use derive_more::{Display, Error};
 use futures_util::{stream::once, FutureExt as _, StreamExt as _};
 use rand::Rng as _;
 use regex::Regex;

actix-http/tests/test_ws.rs

@@ -14,7 +14,7 @@ use actix_http::{
 use actix_http_test::test_server;
 use actix_service::{fn_factory, Service};
 use bytes::Bytes;
-use derive_more::derive::{Display, Error, From};
+use derive_more::{Display, Error, From};
 use futures_core::future::LocalBoxFuture;
 use futures_util::{SinkExt as _, StreamExt as _};
 

actix-multipart/Cargo.toml

@@ -42,7 +42,7 @@ actix-multipart-derive = { version = "=0.7.0", optional = true }
 actix-utils = "3"
 actix-web = { version = "4", default-features = false }
 
-derive_more = { version = "1", features = ["display", "error", "from"] }
+derive_more = { version = "2", features = ["display", "error", "from"] }
 futures-core = { version = "0.3.17", default-features = false, features = ["alloc"] }
 futures-util = { version = "0.3.17", default-features = false, features = ["alloc"] }
 httparse = "1.3"

actix-multipart/src/error.rs

@@ -5,7 +5,7 @@ use actix_web::{
     http::StatusCode,
     ResponseError,
 };
-use derive_more::derive::{Display, Error, From};
+use derive_more::{Display, Error, From};
 
 /// A set of errors that can occur during parsing multipart streams.
 #[derive(Debug, Display, From, Error)]

actix-multipart/src/field.rs

@@ -13,7 +13,7 @@ use actix_web::{
     http::header::{self, ContentDisposition, HeaderMap},
     web::{Bytes, BytesMut},
 };
-use derive_more::derive::{Display, Error};
+use derive_more::{Display, Error};
 use futures_core::Stream;
 use mime::Mime;
 

actix-multipart/src/form/json.rs

@@ -3,7 +3,7 @@
 use std::sync::Arc;
 
 use actix_web::{http::StatusCode, web, Error, HttpRequest, ResponseError};
-use derive_more::derive::{Deref, DerefMut, Display, Error};
+use derive_more::{Deref, DerefMut, Display, Error};
 use futures_core::future::LocalBoxFuture;
 use serde::de::DeserializeOwned;
 

actix-multipart/src/form/mod.rs

@@ -8,7 +8,7 @@ use std::{
 };
 
 use actix_web::{dev, error::PayloadError, web, Error, FromRequest, HttpRequest};
-use derive_more::derive::{Deref, DerefMut};
+use derive_more::{Deref, DerefMut};
 use futures_core::future::LocalBoxFuture;
 use futures_util::{TryFutureExt as _, TryStreamExt as _};
 

actix-multipart/src/form/tempfile.rs

@@ -7,7 +7,7 @@ use std::{
 };
 
 use actix_web::{http::StatusCode, web, Error, HttpRequest, ResponseError};
-use derive_more::derive::{Display, Error};
+use derive_more::{Display, Error};
 use futures_core::future::LocalBoxFuture;
 use futures_util::TryStreamExt as _;
 use mime::Mime;

actix-multipart/src/form/text.rs

@@ -3,7 +3,7 @@
 use std::{str, sync::Arc};
 
 use actix_web::{http::StatusCode, web, Error, HttpRequest, ResponseError};
-use derive_more::derive::{Deref, DerefMut, Display, Error};
+use derive_more::{Deref, DerefMut, Display, Error};
 use futures_core::future::LocalBoxFuture;
 use serde::de::DeserializeOwned;
 

actix-web/Cargo.toml

@@ -145,7 +145,7 @@ bytes = "1"
 bytestring = "1"
 cfg-if = "1"
 cookie = { version = "0.16", features = ["percent-encode"], optional = true }
-derive_more = { version = "1", features = ["display", "error", "from"] }
+derive_more = { version = "2", features = ["display", "error", "from"] }
 encoding_rs = "0.8"
 foldhash = "0.1"
 futures-core = { version = "0.3.17", default-features = false }

actix-web/src/error/mod.rs

@@ -6,7 +6,7 @@
 //
 // See <https://github.com/rust-lang/rust/issues/83375>
 pub use actix_http::error::{ContentTypeError, DispatchError, HttpError, ParseError, PayloadError};
-use derive_more::derive::{Display, Error, From};
+use derive_more::{Display, Error, From};
 use serde_json::error::Error as JsonError;
 use serde_urlencoded::{de::Error as FormDeError, ser::Error as FormError};
 use url::ParseError as UrlParseError;

actix-web/src/http/header/content_length.rs

@@ -1,6 +1,6 @@
 use std::{convert::Infallible, str};
 
-use derive_more::derive::{Deref, DerefMut};
+use derive_more::{Deref, DerefMut};
 
 use crate::{
     error::ParseError,

actix-web/src/info.rs

@@ -1,7 +1,7 @@
 use std::{convert::Infallible, net::SocketAddr};
 
 use actix_utils::future::{err, ok, Ready};
-use derive_more::derive::{Display, Error};
+use derive_more::{Display, Error};
 
 use crate::{
     dev::{AppConfig, Payload, RequestHead},

actix-web/src/types/path.rs

@@ -4,7 +4,7 @@ use std::sync::Arc;
 
 use actix_router::PathDeserializer;
 use actix_utils::future::{ready, Ready};
-use derive_more::derive::{AsRef, Deref, DerefMut, Display, From};
+use derive_more::{AsRef, Deref, DerefMut, Display, From};
 use serde::de;
 
 use crate::{
@@ -152,7 +152,7 @@ impl PathConfig {
 #[cfg(test)]
 mod tests {
     use actix_router::ResourceDef;
-    use derive_more::derive::Display;
+    use derive_more::Display;
     use serde::Deserialize;
 
     use super::*;

actix-web/src/types/query.rs

@@ -187,7 +187,7 @@ impl QueryConfig {
 #[cfg(test)]
 mod tests {
     use actix_http::StatusCode;
-    use derive_more::derive::Display;
+    use derive_more::Display;
     use serde::Deserialize;
 
     use super::*;

awc/Cargo.toml

@@ -106,7 +106,7 @@ actix-utils = "3"
 base64 = "0.22"
 bytes = "1"
 cfg-if = "1"
-derive_more = { version = "1", features = ["display", "error", "from"] }
+derive_more = { version = "2", features = ["display", "error", "from"] }
 futures-core = { version = "0.3.17", default-features = false, features = ["alloc"] }
 futures-util = { version = "0.3.17", default-features = false, features = ["alloc", "sink"] }
 h2 = "0.3.26"

awc/src/client/error.rs

@@ -3,7 +3,7 @@ use std::{fmt, io};
 use actix_http::error::{HttpError, ParseError};
 #[cfg(feature = "openssl")]
 use actix_tls::accept::openssl::reexports::Error as OpensslError;
-use derive_more::derive::{Display, From};
+use derive_more::{Display, From};
 
 use crate::BoxError;
 

awc/src/error.rs

@@ -7,7 +7,7 @@ pub use actix_http::{
     ws::{HandshakeError as WsHandshakeError, ProtocolError as WsProtocolError},
     StatusCode,
 };
-use derive_more::derive::{Display, From};
+use derive_more::{Display, From};
 use serde_json::error::Error as JsonError;
 
 pub use crate::client::{ConnectError, FreezeRequestError, InvalidUrl, SendRequestError};

awc/src/sender.rs

@@ -17,7 +17,7 @@ use actix_http::{
 use actix_http::{encoding::Decoder, header::ContentEncoding, Payload};
 use actix_rt::time::{sleep, Sleep};
 use bytes::Bytes;
-use derive_more::derive::From;
+use derive_more::From;
 use futures_core::Stream;
 use serde::Serialize;