activate Cow::Borrowed via IntoBody (#355)

kanarus · web-flow · commit 6e243ac823e2 · 2025-02-08T13:51:28.000+09:00
* simplify `format::{Text, HTML}` bound: `Into&lt;Cow&lt;str&gt;&gt;` -&gt; `Into&lt;String&gt;`

* format: accept 'static body by `Cow::Borrowed` variant
diff --git a/ohkami/src/format/builtin/html.rs b/ohkami/src/format/builtin/html.rs
@@ -1,16 +1,20 @@
 use crate::IntoBody;
+use std::borrow::Cow;
 
 #[cfg(feature="openapi")]
 use crate::openapi;
 
 
 pub struct HTML<T = String>(pub T);
 
-impl<T: Into<std::borrow::Cow<'static, str>>> IntoBody for HTML<T> {
+impl<T: Into<Cow<'static, str>>> IntoBody for HTML<T> {
     const CONTENT_TYPE: &'static str = "text/html; charset=UTF-8";
-    fn into_body(self) -> Result<Vec<u8>, impl std::fmt::Display> {
-        let cow: std::borrow::Cow<'static, str> = self.0.into();
-        Ok::<_, std::convert::Infallible>(cow.into_owned().into_bytes())
+
+    fn into_body(self) -> Result<Cow<'static, [u8]>, impl std::fmt::Display> {
+        Result::<_, std::convert::Infallible>::Ok(match self.0.into() {
+            Cow::Owned(s) => Cow::Owned(s.into_bytes()),
+            Cow::Borrowed(s) => Cow::Borrowed(s.as_bytes()),
+        })
     }
 
     #[cfg(feature="openapi")]
diff --git a/ohkami/src/format/builtin/json.rs b/ohkami/src/format/builtin/json.rs
@@ -1,5 +1,6 @@
 use crate::{FromBody, IntoBody};
 use super::bound::{self, Incoming, Outgoing};
+use std::borrow::Cow;
 
 #[cfg(feature="openapi")]
 use crate::openapi;
@@ -25,8 +26,8 @@ impl<T: Outgoing> IntoBody for JSON<T> {
     const CONTENT_TYPE: &'static str = "application/json";
 
     #[inline]
-    fn into_body(self) -> Result<Vec<u8>, impl std::fmt::Display> {
-        serde_json::to_vec(&self.0)
+    fn into_body(self) -> Result<Cow<'static, [u8]>, impl std::fmt::Display> {
+        serde_json::to_vec(&self.0).map(Cow::Owned)
     }
 
     #[cfg(feature="openapi")]
diff --git a/ohkami/src/format/builtin/text.rs b/ohkami/src/format/builtin/text.rs
@@ -1,4 +1,5 @@
 use crate::{FromBody, IntoBody};
+use std::borrow::Cow;
 
 #[cfg(feature="openapi")]
 use crate::openapi;
@@ -8,6 +9,7 @@ pub struct Text<T>(pub T);
 
 impl<'req, T: From<&'req str>> FromBody<'req> for Text<T> {
     const MIME_TYPE: &'static str = "text/plain";
+
     fn from_body(body: &'req [u8]) -> Result<Self, impl std::fmt::Display> {
         std::str::from_utf8(body).map(|s| Text(s.into()))
     }
@@ -18,11 +20,14 @@ impl<'req, T: From<&'req str>> FromBody<'req> for Text<T> {
     }
 }
 
-impl<T: Into<std::borrow::Cow<'static, str>>> IntoBody for Text<T> {
+impl<T: Into<Cow<'static, str>>> IntoBody for Text<T> {
     const CONTENT_TYPE: &'static str = "text/plain; charset=UTF-8";
-    fn into_body(self) -> Result<Vec<u8>, impl std::fmt::Display> {
-        let cow: std::borrow::Cow<'static, str> = self.0.into();
-        Ok::<_, std::convert::Infallible>(cow.into_owned().into_bytes())
+
+    fn into_body(self) -> Result<Cow<'static, [u8]>, impl std::fmt::Display> {
+        Result::<_, std::convert::Infallible>::Ok(match self.0.into() {
+            Cow::Owned(s) => Cow::Owned(s.into_bytes()),
+            Cow::Borrowed(s) => Cow::Borrowed(s.as_bytes()),
+        })
     }
 
     #[cfg(feature="openapi")]
diff --git a/ohkami/src/format/builtin/urlencoded.rs b/ohkami/src/format/builtin/urlencoded.rs
@@ -1,6 +1,7 @@
 use crate::{FromBody, IntoBody};
 use super::bound::{self, Incoming, Outgoing};
 use ohkami_lib::serde_urlencoded;
+use std::borrow::Cow;
 
 #[cfg(feature="openapi")]
 use crate::openapi;
@@ -10,6 +11,7 @@ pub struct URLEncoded<T: bound::Schema>(pub T);
 
 impl<'req, T: Incoming<'req>> FromBody<'req> for URLEncoded<T> {
     const MIME_TYPE: &'static str = "application/x-www-form-urlencoded";
+
     fn from_body(body: &'req [u8]) -> Result<Self, impl std::fmt::Display> {
         serde_urlencoded::from_bytes(body).map(URLEncoded)
     }
@@ -22,8 +24,9 @@ impl<'req, T: Incoming<'req>> FromBody<'req> for URLEncoded<T> {
 
 impl<T: Outgoing> IntoBody for URLEncoded<T> {
     const CONTENT_TYPE: &'static str = "application/x-www-form-urlencoded";
-    fn into_body(self) -> Result<Vec<u8>, impl std::fmt::Display> {
-        serde_urlencoded::to_string(&self.0).map(String::into_bytes)
+
+    fn into_body(self) -> Result<Cow<'static, [u8]>, impl std::fmt::Display> {
+        serde_urlencoded::to_string(&self.0).map(|s| Cow::Owned(s.into_bytes()))
     }
 
     #[cfg(feature="openapi")]
diff --git a/ohkami/src/request/from_request.rs b/ohkami/src/request/from_request.rs
@@ -15,7 +15,6 @@ use crate::openapi;
 /// 
 /// <br>
 /// 
-/// ---
 /// *example.rs*
 /// ```
 /// use ohkami::prelude::*;
@@ -31,11 +30,12 @@ use crate::openapi;
 ///     }
 /// }
 /// ```
-/// ---
 /// 
 /// <br>
 /// 
-/// NOTE: *MUST NOT impl both `FromRequest` and `FromParam` or `FromHeader`*.
+/// ### Note
+/// 
+/// *MUST NOT impl both `FromRequest` and `FromParam`*.
 pub trait FromRequest<'req>: Sized {
     /// If this extraction never fails, `std::convert::Infallible` is recomended.
     type Error: IntoResponse;
diff --git a/ohkami/src/response/into_response.rs b/ohkami/src/response/into_response.rs
@@ -5,6 +5,8 @@ use crate::{Response, Status};
 #[cfg(feature="openapi")]
 use crate::openapi;
 
+use std::borrow::Cow;
+
 
 /// A trait implemented to be a returned value of a handler
 /// 
@@ -47,15 +49,15 @@ pub trait IntoBody {
     /// e.g. `text/html; charset=UTF-8`
     const CONTENT_TYPE: &'static str;
 
-    fn into_body(self) -> Result<Vec<u8>, impl std::fmt::Display>;
+    fn into_body(self) -> Result<Cow<'static, [u8]>, impl std::fmt::Display>;
 
     #[cfg(feature="openapi")]
     fn openapi_responsebody() -> impl Into<openapi::schema::SchemaRef>;
 }
 impl<B: IntoBody> IntoResponse for B {
     #[inline]
     fn into_response(self) -> Response {
-        if Self::CONTENT_TYPE == "" {// removed by optimization if it's not ""
+        if const {Self::CONTENT_TYPE.is_empty()} {// removed by optimization if it's not ""
             return Response::OK()
         }
 
@@ -141,9 +143,9 @@ impl IntoBody for () {
     const CONTENT_TYPE: &'static str = "";
 
     #[cold] #[inline(never)]
-    fn into_body(self) -> Result<Vec<u8>, impl std::fmt::Display> {
+    fn into_body(self) -> Result<Cow<'static, [u8]>, impl std::fmt::Display> {
         #[allow(unreachable_code)]
-        {unreachable!("`into_body` of `()`") as Result<Vec<u8>, std::convert::Infallible>}
+        {unreachable!("`into_body` of `()`") as Result<Cow<'static, [u8]>, std::convert::Infallible>}
     }
 
     #[cfg(feature="openapi")]
@@ -155,13 +157,14 @@ impl IntoBody for () {
 }
 
 macro_rules! text_response {
-    ($( $t:ty )*) => {$(
+    ($( $t:ty: $this:ident => $conv:expr ),*) => {$(
         impl IntoBody for $t {
             const CONTENT_TYPE: &'static str = "text/plain; charset=UTF-8";
 
             #[inline(always)]
-            fn into_body(self) -> Result<Vec<u8>, impl std::fmt::Display> {
-                Ok::<_, std::convert::Infallible>(String::from(self).into_bytes())
+            fn into_body(self) -> Result<Cow<'static, [u8]>, impl std::fmt::Display> {
+                let $this = self;
+                Ok::<_, std::convert::Infallible>($conv)
             }
 
             #[cfg(feature="openapi")]
@@ -171,9 +174,12 @@ macro_rules! text_response {
         }
     )*};
 } text_response! {
-    &'static str
-    String
-    std::borrow::Cow<'static, str>
+    &'static str:      s => Cow::Borrowed(s.as_bytes()),
+    String:            s => Cow::Owned(s.into_bytes()),
+    Cow<'static, str>: s => match s {
+        Cow::Owned(s)    => Cow::Owned(s.into_bytes()),
+        Cow::Borrowed(s) => Cow::Borrowed(s.as_bytes()),
+    }
 }
 
 #[cfg(feature="rt_worker")]
