Code cleanup

emmett-framework · Jan 25, 2024 · 6d00b52 · 6d00b52
1 parent 6a76ac1
commit 6d00b52
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/asgi/types.rs b/src/asgi/types.rs
@@ -1,5 +1,6 @@
 use hyper::{
     header::{self, HeaderMap},
+    http::uri::Authority,
     Uri, Version,
 };
 use percent_encoding::percent_decode_str;
@@ -109,7 +110,7 @@ impl ASGIScope {
             ))?;
         }
         if !self.headers.contains_key(header::HOST) {
-            let host = self.uri.authority().map(|v| v.as_str()).unwrap_or("");
+            let host = self.uri.authority().map_or("", Authority::as_str);
             rv.insert(0, (PyBytes::new(py, b"host"), PyBytes::new(py, host.as_bytes())))?;
         }
         Ok(rv)

diff --git a/src/wsgi/types.rs b/src/wsgi/types.rs
@@ -3,6 +3,7 @@ use http_body_util::BodyExt;
 use hyper::{
     body::Bytes,
     header::{HeaderMap, CONTENT_LENGTH, CONTENT_TYPE, HOST},
+    http::uri::Authority,
     Method, Uri, Version,
 };
 use percent_encoding::percent_decode_str;
@@ -174,7 +175,7 @@ impl WSGIScope {
                 ));
             }
             if !self.headers.contains_key(HOST) {
-                let host = self.uri.authority().map(|v| v.as_str()).unwrap_or("");
+                let host = self.uri.authority().map_or("", Authority::as_str);
                 headers.push(("HTTP_HOST".to_string(), host));
             }