From 215a294584fc2d209aef974a2e3b0759c1488c08 Mon Sep 17 00:00:00 2001
From: Rob Ede <robjtede@icloud.com>
Date: Sun, 7 Jul 2024 00:30:27 +0100
Subject: [PATCH] chore(actix-multipart-derive): prepare release 0.7.0

---
 actix-multipart-derive/CHANGES.md | 2 ++
 actix-multipart-derive/Cargo.toml | 2 +-
 actix-multipart-derive/README.md  | 4 ++--
 actix-multipart/CHANGES.md        | 2 ++
 actix-multipart/Cargo.toml        | 2 +-
 actix-multipart/src/field.rs      | 5 +++--
 6 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/actix-multipart-derive/CHANGES.md b/actix-multipart-derive/CHANGES.md
index 1b44ba4b7..d0c759297 100644
--- a/actix-multipart-derive/CHANGES.md
+++ b/actix-multipart-derive/CHANGES.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 0.7.0
+
 - Minimum supported Rust version (MSRV) is now 1.72.
 
 ## 0.6.1
diff --git a/actix-multipart-derive/Cargo.toml b/actix-multipart-derive/Cargo.toml
index 35cbcc130..33eacd460 100644
--- a/actix-multipart-derive/Cargo.toml
+++ b/actix-multipart-derive/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "actix-multipart-derive"
-version = "0.6.1"
+version = "0.7.0"
 authors = ["Jacob Halsey <jacob@jhalsey.com>"]
 description = "Multipart form derive macro for Actix Web"
 keywords = ["http", "web", "framework", "async", "futures"]
diff --git a/actix-multipart-derive/README.md b/actix-multipart-derive/README.md
index ec0afffdd..bf75613ed 100644
--- a/actix-multipart-derive/README.md
+++ b/actix-multipart-derive/README.md
@@ -5,11 +5,11 @@
 <!-- prettier-ignore-start -->
 
 [![crates.io](https://img.shields.io/crates/v/actix-multipart-derive?label=latest)](https://crates.io/crates/actix-multipart-derive)
-[![Documentation](https://docs.rs/actix-multipart-derive/badge.svg?version=0.6.1)](https://docs.rs/actix-multipart-derive/0.6.1)
+[![Documentation](https://docs.rs/actix-multipart-derive/badge.svg?version=0.7.0)](https://docs.rs/actix-multipart-derive/0.7.0)
 ![Version](https://img.shields.io/badge/rustc-1.72+-ab6000.svg)
 ![MIT or Apache 2.0 licensed](https://img.shields.io/crates/l/actix-multipart-derive.svg)
 <br />
-[![dependency status](https://deps.rs/crate/actix-multipart-derive/0.6.1/status.svg)](https://deps.rs/crate/actix-multipart-derive/0.6.1)
+[![dependency status](https://deps.rs/crate/actix-multipart-derive/0.7.0/status.svg)](https://deps.rs/crate/actix-multipart-derive/0.7.0)
 [![Download](https://img.shields.io/crates/d/actix-multipart-derive.svg)](https://crates.io/crates/actix-multipart-derive)
 [![Chat on Discord](https://img.shields.io/discord/771444961383153695?label=chat&logo=discord)](https://discord.gg/NWpN5mmg3x)
 
diff --git a/actix-multipart/CHANGES.md b/actix-multipart/CHANGES.md
index adc568253..201502691 100644
--- a/actix-multipart/CHANGES.md
+++ b/actix-multipart/CHANGES.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+- Fix re-exported version of `actix-multipart-derive`.
+
 ## 0.7.1
 
 - Expose `LimitExceeded` error type.
diff --git a/actix-multipart/Cargo.toml b/actix-multipart/Cargo.toml
index f567d2d7c..5d81f6973 100644
--- a/actix-multipart/Cargo.toml
+++ b/actix-multipart/Cargo.toml
@@ -37,7 +37,7 @@ derive = ["actix-multipart-derive"]
 tempfile = ["dep:tempfile", "tokio/fs"]
 
 [dependencies]
-actix-multipart-derive = { version = "=0.6.1", optional = true }
+actix-multipart-derive = { version = "=0.7.0", optional = true }
 actix-utils = "3"
 actix-web = { version = "4", default-features = false }
 
diff --git a/actix-multipart/src/field.rs b/actix-multipart/src/field.rs
index 0e4167c8e..652b3e8b7 100644
--- a/actix-multipart/src/field.rs
+++ b/actix-multipart/src/field.rs
@@ -1,12 +1,13 @@
 use std::{
     cell::RefCell,
-    cmp, fmt, mem,
+    cmp, fmt,
+    future::poll_fn,
+    mem,
     pin::Pin,
     rc::Rc,
     task::{ready, Context, Poll},
 };
 
-use actix_utils::future::poll_fn;
 use actix_web::{
     error::PayloadError,
     http::header::{self, ContentDisposition, HeaderMap},