Merge pull request #31 from wacker-dev/inline

Add the #[inline] attr for some methods
wacker-dev · Nov 8, 2024 · 4bc997d · 4bc997d
2 parents aa8cc57 + ff77ecb
commit 4bc997d
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 0 deletions.
diff --git a/waki/src/body.rs b/waki/src/body.rs
@@ -12,6 +12,7 @@ pub struct IncomingBodyStream {
 }
 
 impl From<IncomingBody> for IncomingBodyStream {
+    #[inline]
     fn from(body: IncomingBody) -> Self {
         Self {
             // The stream() method can only be called once
@@ -37,6 +38,7 @@ pub enum Body {
 }
 
 impl Body {
+    #[inline]
     pub fn chunk(&self, len: u64) -> Result<Option<Vec<u8>>> {
         match &self {
             Body::Bytes(_) => Ok(None),

diff --git a/waki/src/client.rs b/waki/src/client.rs
@@ -4,34 +4,42 @@ use crate::{Method, RequestBuilder};
 pub struct Client {}
 
 impl Client {
+    #[inline]
     pub fn new() -> Self {
         Default::default()
     }
 
+    #[inline]
     pub fn get(&self, url: &str) -> RequestBuilder {
         self.request(Method::Get, url)
     }
 
+    #[inline]
     pub fn post(&self, url: &str) -> RequestBuilder {
         self.request(Method::Post, url)
     }
 
+    #[inline]
     pub fn put(&self, url: &str) -> RequestBuilder {
         self.request(Method::Put, url)
     }
 
+    #[inline]
     pub fn patch(&self, url: &str) -> RequestBuilder {
         self.request(Method::Patch, url)
     }
 
+    #[inline]
     pub fn delete(&self, url: &str) -> RequestBuilder {
         self.request(Method::Delete, url)
     }
 
+    #[inline]
     pub fn head(&self, url: &str) -> RequestBuilder {
         self.request(Method::Head, url)
     }
 
+    #[inline]
     pub fn request(&self, method: Method, url: &str) -> RequestBuilder {
         RequestBuilder::new(method, url)
     }

diff --git a/waki/src/common/request_and_response.rs b/waki/src/common/request_and_response.rs
@@ -14,11 +14,13 @@ macro_rules! impl_common_get_methods {
     ($($t:ty),+ $(,)?) => ($(
         impl $t {
             /// Get the header.
+            #[inline]
             pub fn header<K: AsHeaderName>(&self, key: K) -> Option<&HeaderValue> {
                 self.headers.get(key)
             }
 
             /// Get headers.
+            #[inline]
             pub fn headers(&self) -> &HeaderMap {
                 &self.headers
             }
@@ -29,13 +31,15 @@ macro_rules! impl_common_get_methods {
             ///
             /// NOTE: This method is only for incoming requests/responses, if you call it on an
             /// outgoing request/response it will always return None.
+            #[inline]
             pub fn chunk(&self, len: u64) -> Result<Option<Vec<u8>>> {
                 self.body.chunk(len)
             }
 
             /// Get the full body.
             ///
             /// It will block until the stream is closed.
+            #[inline]
             pub fn body(self) -> Result<Vec<u8>> {
                 self.body.bytes()
             }
@@ -181,6 +185,7 @@ macro_rules! impl_common_set_methods {
             /// r.body("hello");
             /// # }
             /// ```
+            #[inline]
             pub fn body<V: Into<Vec<u8>>>(mut self, body: V) -> Self {
                 if let Ok(ref mut inner) = self.inner {
                     inner.body = Body::Bytes(body.into());

diff --git a/waki/src/common/scheme.rs b/waki/src/common/scheme.rs
@@ -1,6 +1,7 @@
 use crate::bindings::wasi::http::types::Scheme;
 
 impl From<&str> for Scheme {
+    #[inline]
     fn from(s: &str) -> Self {
         match s {
             "http" => Scheme::Http,
@@ -13,6 +14,7 @@ impl From<&str> for Scheme {
 impl TryInto<http::uri::Scheme> for Scheme {
     type Error = http::uri::InvalidUri;
 
+    #[inline]
     fn try_into(self) -> Result<http::uri::Scheme, Self::Error> {
         match self {
             Scheme::Http => Ok(http::uri::Scheme::HTTP),

diff --git a/waki/src/request.rs b/waki/src/request.rs
@@ -23,6 +23,7 @@ pub struct RequestBuilder {
 }
 
 impl RequestBuilder {
+    #[inline]
     pub fn new(method: Method, uri: &str) -> Self {
         Self {
             inner: uri.parse::<Uri>().map_or_else(
@@ -86,6 +87,7 @@ impl RequestBuilder {
     /// # Ok(())
     /// # }
     /// ```
+    #[inline]
     pub fn connect_timeout(mut self, timeout: Duration) -> Self {
         if let Ok(ref mut req) = self.inner {
             req.connect_timeout = Some(timeout.as_nanos() as u64);
@@ -94,11 +96,13 @@ impl RequestBuilder {
     }
 
     /// Build the Request.
+    #[inline]
     pub fn build(self) -> Result<Request> {
         self.inner
     }
 
     /// Send the Request, returning a [`Response`].
+    #[inline]
     pub fn send(self) -> Result<Response> {
         match self.inner {
             Ok(req) => req.send(),
@@ -162,6 +166,7 @@ impl TryFrom<IncomingRequest> for Request {
 }
 
 impl Request {
+    #[inline]
     pub fn new(method: Method, uri: Parts) -> Self {
         Self {
             method,
@@ -172,16 +177,19 @@ impl Request {
         }
     }
 
+    #[inline]
     pub fn builder(method: Method, uri: &str) -> RequestBuilder {
         RequestBuilder::new(method, uri)
     }
 
     /// Get the HTTP method of the request.
+    #[inline]
     pub fn method(&self) -> Method {
         self.method.clone()
     }
 
     /// Get the path of the request.
+    #[inline]
     pub fn path(&self) -> &str {
         match &self.uri.path_and_query {
             Some(path_and_query) => path_and_query.path(),
@@ -202,6 +210,7 @@ impl Request {
     }
 
     /// Get the authority of the request.
+    #[inline]
     pub fn authority(&self) -> &Option<Authority> {
         &self.uri.authority
     }

diff --git a/waki/src/response.rs b/waki/src/response.rs
@@ -15,12 +15,14 @@ pub struct ResponseBuilder {
 }
 
 impl Default for ResponseBuilder {
+    #[inline]
     fn default() -> Self {
         Self::new()
     }
 }
 
 impl ResponseBuilder {
+    #[inline]
     pub fn new() -> Self {
         Self {
             inner: Ok(Response::new()),
@@ -30,6 +32,7 @@ impl ResponseBuilder {
     /// Set the status code for the response.
     ///
     /// Default value: 200.
+    #[inline]
     pub fn status_code(mut self, status_code: u16) -> Self {
         if let Ok(ref mut resp) = self.inner {
             resp.status_code = status_code;
@@ -38,6 +41,7 @@ impl ResponseBuilder {
     }
 
     /// Build the Response.
+    #[inline]
     pub fn build(self) -> Result<Response, ErrorCode> {
         match self.inner {
             Ok(inner) => Ok(inner),
@@ -53,6 +57,7 @@ pub struct Response {
 }
 
 impl Default for Response {
+    #[inline]
     fn default() -> Self {
         Self::new()
     }
@@ -77,6 +82,7 @@ impl TryFrom<IncomingResponse> for Response {
 }
 
 impl Response {
+    #[inline]
     pub fn new() -> Self {
         Self {
             headers: HeaderMap::new(),
@@ -85,10 +91,12 @@ impl Response {
         }
     }
 
+    #[inline]
     pub fn builder() -> ResponseBuilder {
         ResponseBuilder::new()
     }
 
+    #[inline]
     /// Get the status code of the response.
     pub fn status_code(&self) -> u16 {
         self.status_code