conduit: Use http::Extensions instead of custom TypeMap (#57)

Turbo87 · web-flow · commit 0c13fc4999e7 · 2021-11-06T18:18:38.000+01:00
diff --git a/conduit-middleware/src/lib.rs b/conduit-middleware/src/lib.rs
@@ -224,8 +224,8 @@ mod tests {
         }
     }
 
-    fn get_extension<T: Any>(req: &dyn RequestExt) -> &T {
-        req.extensions().find::<T>().unwrap()
+    fn get_extension<T: Any + Send + Sync>(req: &dyn RequestExt) -> &T {
+        req.extensions().get::<T>().unwrap()
     }
 
     fn response(string: String) -> Response<Body> {
diff --git a/conduit-router/src/lib.rs b/conduit-router/src/lib.rs
@@ -143,7 +143,7 @@ pub trait RequestParams<'a> {
 
 impl<'a> RequestParams<'a> for &'a (dyn RequestExt + 'a) {
     fn params(self) -> &'a Params {
-        self.extensions().find::<Params>().expect("Missing params")
+        self.extensions().get::<Params>().expect("Missing params")
     }
 }
 
@@ -235,7 +235,7 @@ mod tests {
             req.params().find("id").unwrap_or("").to_string(),
             format!("{:?}", req.method()),
             req.extensions()
-                .find::<RoutePattern>()
+                .get::<RoutePattern>()
                 .unwrap()
                 .pattern()
                 .to_string(),
diff --git a/conduit/src/lib.rs b/conduit/src/lib.rs
@@ -8,8 +8,6 @@ use std::time::{Duration, Instant};
 
 pub use http::{header, HeaderMap, Method, Request, Response, StatusCode, Version};
 
-mod typemap;
-
 pub type ResponseResult<Error> = Result<Response<Body>, Error>;
 pub type HttpResult = ResponseResult<http::Error>;
 
@@ -83,7 +81,7 @@ pub enum Host<'a> {
 }
 
 /// A Dictionary for extensions provided by the server or middleware
-pub type Extensions = typemap::TypeMap;
+pub type Extensions = http::Extensions;
 
 pub trait RequestExt {
     /// The elapsed time since the start of the request (headers received)
@@ -93,11 +91,7 @@ pub trait RequestExt {
     /// This method may panic if the server does not add `StartInstant` to the
     /// request extensions, or if it has been removed by the application.
     fn elapsed(&self) -> Duration {
-        self.extensions()
-            .find::<StartInstant>()
-            .unwrap()
-            .0
-            .elapsed()
+        self.extensions().get::<StartInstant>().unwrap().0.elapsed()
     }
 
     /// The version of HTTP being used
diff --git a/conduit/src/typemap.rs b/conduit/src/typemap.rs

Original file line number	Diff line number	Diff line change
`@@ -224,8 +224,8 @@ mod tests {`
`224`	`224`	`}`
`225`	`225`	`}`
`226`	`226`
`227`		`- fn get_extension<T: Any>(req: &dyn RequestExt) -> &T {`
`228`		`- req.extensions().find::<T>().unwrap()`
	`227`	`+ fn get_extension<T: Any + Send + Sync>(req: &dyn RequestExt) -> &T {`
	`228`	`+ req.extensions().get::<T>().unwrap()`
`229`	`229`	`}`
`230`	`230`
`231`	`231`	`fn response(string: String) -> Response<Body> {`