bump: v0.5.1

Author: fundon

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "form-data"
-version = "0.5.0"
+version = "0.5.1"
 authors = ["Fangdun Tsai <[email protected]>"]
 description = "AsyncRead/AsyncWrite/Stream `multipart/form-data`"
 homepage = "https://github.com/viz-rs/form-data"
@@ -21,7 +21,7 @@ include = [
 [features]
 default = ["async"]
 
-async = ["futures-util"]
+async = ["futures-util/io"]
 sync = []
 
 [dependencies]
@@ -33,24 +33,26 @@ memchr = "2.6"
 tracing = "0.1"
 thiserror = "1.0"
 serde = { version = "1.0", features = ["derive"] }
-futures-util = { version = "0.3", default-features = false, features = [
-  "io",
-], optional = true }
+
+[dependencies.futures-util]
+version = "0.3"
+default-features = false
+optional = true
 
 [dev-dependencies]
 anyhow = "1.0"
-rand = "0.8"
 async-fs = "2.0"
-tempfile = "3.8"
-hyper = { version = "1.0", features = ["server", "http1"] }
-hyper-util = { version = "0.1", features = ["tokio"] }
 http-body = "1.0"
 http-body-util = "0.1"
+hyper = { version = "1.1", features = ["server", "http1"] }
+hyper-util = { version = "0.1.2", features = ["tokio"] }
+rand = "0.8"
+tempfile = "3.8"
+tiny_http = "0.12"
 tokio = { version = "1.0", features = ["macros", "rt-multi-thread"] }
 tokio-util = { version = "0.7", features = ["io"] }
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
-warp = "0.3"
-tiny_http = "0.12"
+# warp = "0.3"
 
 [[example]]
 name = "hyper"

src/async.rs

@@ -11,7 +11,10 @@ use futures_util::{
     io::{self, AsyncRead, AsyncWrite, AsyncWriteExt},
     stream::{Stream, TryStreamExt},
 };
-use http::header::{CONTENT_DISPOSITION, CONTENT_TYPE};
+use http::{
+    header::{CONTENT_DISPOSITION, CONTENT_TYPE},
+    HeaderValue,
+};
 use tracing::trace;
 
 use crate::{
@@ -263,7 +266,10 @@ where
                     // invalid content disposition
                     let Some((name, filename)) = headers
                         .remove(CONTENT_DISPOSITION)
-                        .and_then(|v| parse_content_disposition(v.as_bytes()).ok())
+                        .as_ref()
+                        .map(HeaderValue::as_bytes)
+                        .map(parse_content_disposition)
+                        .and_then(Result::ok)
                     else {
                         return Poll::Ready(Some(Err(Error::InvalidContentDisposition)));
                     };

src/lib.rs

@@ -161,21 +161,21 @@
 #![allow(clippy::missing_errors_doc)]
 
 mod error;
+pub use error::Error;
+
 mod field;
-mod form;
-mod limits;
-mod state;
-mod utils;
+pub use field::Field;
 
+mod form;
 pub use form::FormData;
 
-pub use field::Field;
+mod limits;
+pub use limits::Limits;
 
+mod state;
 pub use state::*;
 
-pub use limits::Limits;
-
-pub use error::Error;
+mod utils;
 
 pub(crate) type Result<T, E = Error> = std::result::Result<T, E>;
 

src/state.rs

@@ -20,6 +20,7 @@ pub(crate) enum Flag {
     Next,
     Eof,
 }
+
 /// IO State
 pub struct State<T> {
     io: T,

src/utils.rs

@@ -12,10 +12,12 @@ const NAME: &[u8; 4] = b"name";
 const FILE_NAME: &[u8; 8] = b"filename";
 const FORM_DATA: &[u8; 9] = b"form-data";
 
-pub(crate) fn parse_content_type(header: Option<&http::HeaderValue>) -> Option<mime::Mime> {
+pub(crate) fn parse_content_type(header: Option<&HeaderValue>) -> Option<mime::Mime> {
     header
-        .and_then(|val| val.to_str().ok())
-        .and_then(|val| val.parse::<mime::Mime>().ok())
+        .map(HeaderValue::to_str)
+        .and_then(Result::ok)
+        .map(str::parse)
+        .and_then(Result::ok)
 }
 
 pub(crate) fn parse_part_headers(bytes: &[u8]) -> Result<HeaderMap> {