refactorred roa-body

Author: Hexilee

roa-body/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "roa-body"
-version = "0.5.0-beta.1"
+version = "0.5.0-beta.2"
 authors = ["Hexilee <i@hexilee.me>"]
 edition = "2018"
 license = "MIT"
@@ -25,15 +25,13 @@ codecov = { repository = "Hexilee/roa" }
 log = "0.4"
 futures = "0.3"
 async-std = "1.5.0"
-mime = "0.3"
 bytes = "0.5.4"
-
+lazy_static = "1.4"
 roa-core = { path = "../roa-core", version = "0.5.0-beta" }
 serde = { version = "1", optional = true }
 askama = { version = "0.9", optional = true }
 serde_json = { version = "1.0", optional = true }
 serde_urlencoded = { version = "0.6", optional = true }
-encoding = { version = "0.2", optional = true }
 mime_guess = { version = "2.0", optional = true }
 percent-encoding = { version = "2.1.0", optional = true }
 
@@ -43,11 +41,12 @@ tokio = { version = "0.2", features = ["full"] }
 reqwest = { version = "0.10", features = ["json", "cookies", "gzip"] }
 roa-tcp = { path = "../roa-tcp", version = "0.5.0-beta" }
 roa-core = { path = "../roa-core", version = "0.5.0-beta", features = ["runtime"] }
+mime = "0.3"
 
 [features]
 default = []
 full = ["json", "urlencoded", "file", "template"]
-json = ["serde", "serde_json", "encoding"]
+json = ["serde", "serde_json"]
 urlencoded = ["serde", "serde_urlencoded"]
 file = ["mime_guess", "percent-encoding"]
 template = ["askama"]

roa-body/src/content_type.rs

@@ -1,9 +1,11 @@
 mod content_disposition;
-use crate::content_type::ContentType;
-use async_std::fs::File;
+mod help;
+
 pub use async_std::path::Path;
-use content_disposition::ContentDisposition;
 pub use content_disposition::DispositionType;
+
+use async_std::fs::File;
+use content_disposition::ContentDisposition;
 use roa_core::{http, Context, Result, State};
 
 #[inline]
@@ -18,8 +20,11 @@ pub async fn write_file<S: State>(
     if let Some(filename) = path.file_name() {
         ctx.resp_mut().headers.insert(
             http::header::CONTENT_TYPE,
-            ContentType(mime_guess::from_path(&filename).first_or_octet_stream())
-                .to_value()?,
+            mime_guess::from_path(&filename)
+                .first_or_octet_stream()
+                .as_ref()
+                .parse()
+                .map_err(help::bug_report)?,
         );
 
         let name = filename.to_string_lossy();

roa-body/src/decode.rs

@@ -1,4 +1,4 @@
-use crate::help::bug_report;
+use super::help::bug_report;
 use percent_encoding::{utf8_percent_encode, AsciiSet, CONTROLS};
 use roa_core::http::header::HeaderValue;
 use roa_core::Result;
@@ -44,6 +44,7 @@ pub struct ContentDisposition {
 }
 
 impl ContentDisposition {
+    #[inline]
     pub(crate) fn new(typ: DispositionType, filename: Option<&str>) -> Self {
         Self {
             typ,
@@ -52,6 +53,7 @@ impl ContentDisposition {
         }
     }
 
+    #[inline]
     pub fn value(&self) -> Result<HeaderValue> {
         let value_str = self.to_string();
         value_str.parse().map_err(|err| {
@@ -64,6 +66,7 @@ impl ContentDisposition {
 }
 
 impl Display for ContentDisposition {
+    #[inline]
     fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
         match &self.encoded_filename {
             None => f.write_fmt(format_args!("{}", self.typ)),
@@ -76,6 +79,7 @@ impl Display for ContentDisposition {
 }
 
 impl Display for DispositionType {
+    #[inline]
     fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
         match self {
             DispositionType::Inline => f.write_str("inline"),

roa-body/src/file.rs

@@ -4,6 +4,7 @@ use roa_core::Error;
 const BUG_HELP: &str =
     r"This is a bug, please report it to https://github.com/Hexilee/roa.";
 
+#[inline]
 pub fn bug_report(message: impl ToString) -> Error {
     Error::new(
         StatusCode::INTERNAL_SERVER_ERROR,