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>

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;