Adjust to new extension method names

Author: Turbo87

src/middleware/app.rs

@@ -21,7 +21,7 @@ impl Middleware for AppMiddleware {
     }
 
     fn after(&self, req: &mut dyn RequestExt, res: AfterResult) -> AfterResult {
-        req.mut_extensions().pop::<Arc<App>>().unwrap();
+        req.mut_extensions().remove::<Arc<App>>().unwrap();
         res
     }
 }
@@ -33,6 +33,6 @@ pub trait RequestApp {
 
 impl<T: RequestExt + ?Sized> RequestApp for T {
     fn app(&self) -> &Arc<App> {
-        self.extensions().find::<Arc<App>>().expect("Missing app")
+        self.extensions().get::<Arc<App>>().expect("Missing app")
     }
 }

src/middleware/block_traffic.rs

@@ -37,7 +37,7 @@ impl AroundMiddleware for BlockTraffic {
 
 impl Handler for BlockTraffic {
     fn call(&self, req: &mut dyn RequestExt) -> AfterResult {
-        let app = req.extensions().find::<Arc<App>>().expect("Missing app");
+        let app = req.extensions().get::<Arc<App>>().expect("Missing app");
         let domain_name = app.config.domain_name.clone();
 
         let has_blocked_value = req

src/middleware/log_request.rs

@@ -43,7 +43,7 @@ struct CustomMetadata {
 }
 
 pub fn add_custom_metadata<V: Display>(req: &mut dyn RequestExt, key: &'static str, value: V) {
-    if let Some(metadata) = req.mut_extensions().find_mut::<CustomMetadata>() {
+    if let Some(metadata) = req.mut_extensions().get_mut::<CustomMetadata>() {
         metadata.entries.push((key, value.to_string()));
     } else {
         let mut metadata = CustomMetadata {
@@ -78,7 +78,7 @@ fn report_to_sentry(req: &dyn RequestExt, res: &AfterResult) {
             scope.set_tag("response.status", status.as_str());
         }
 
-        if let Some(response_time) = req.extensions().find::<ResponseTime>() {
+        if let Some(response_time) = req.extensions().get::<ResponseTime>() {
             scope.set_extra("Response time [ms]", response_time.as_millis().into());
         }
     });
@@ -87,7 +87,7 @@ fn report_to_sentry(req: &dyn RequestExt, res: &AfterResult) {
 #[cfg(test)]
 pub(crate) fn get_log_message(req: &dyn RequestExt, key: &'static str) -> String {
     // Unwrap shouldn't panic as no other code has access to the private struct to remove it
-    for (k, v) in &req.extensions().find::<CustomMetadata>().unwrap().entries {
+    for (k, v) in &req.extensions().get::<CustomMetadata>().unwrap().entries {
         if key == *k {
             return v.clone();
         }
@@ -131,14 +131,14 @@ impl Display for RequestLine<'_> {
 
         line.add_quoted_field("fwd", request_header(self.req, "x-real-ip"))?;
 
-        let response_time = self.req.extensions().find::<ResponseTime>();
+        let response_time = self.req.extensions().get::<ResponseTime>();
         if let Some(response_time) = response_time {
             line.add_field("service", response_time)?;
         }
         line.add_field("status", status.as_str())?;
         line.add_quoted_field("user_agent", request_header(self.req, header::USER_AGENT))?;
 
-        if let Some(metadata) = self.req.extensions().find::<CustomMetadata>() {
+        if let Some(metadata) = self.req.extensions().get::<CustomMetadata>() {
             for (key, value) in &metadata.entries {
                 line.add_quoted_field(key, value)?;
             }
@@ -164,7 +164,7 @@ impl<'a> Display for FullPath<'a> {
     fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
         let request = self.0;
 
-        let original_path = request.extensions().find::<OriginalPath>();
+        let original_path = request.extensions().get::<OriginalPath>();
         let path = original_path
             .map(|p| p.0.as_str())
             .unwrap_or_else(|| request.path());

src/middleware/update_metrics.rs

@@ -22,7 +22,7 @@ impl Middleware for UpdateMetrics {
 
         let endpoint = req
             .extensions()
-            .find::<RoutePattern>()
+            .get::<RoutePattern>()
             .map(|p| p.pattern())
             .unwrap_or("<unknown>");
         metrics

src/router.rs

@@ -151,7 +151,7 @@ struct C(pub fn(&mut dyn RequestExt) -> EndpointResult);
 
 impl Handler for C {
     fn call(&self, req: &mut dyn RequestExt) -> HandlerResult {
-        if let Some(pattern) = req.extensions().find::<RoutePattern>() {
+        if let Some(pattern) = req.extensions().get::<RoutePattern>() {
             let pattern = pattern.pattern();
 
             // Configure the Sentry `transaction` field *before* we handle the request,