refactor: remove redundant variables

Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net>

Author: rvolosatovs

crates/host/src/wasmbus/providers/http_server/address.rs

@@ -46,19 +46,17 @@ impl wasmcloud_provider_sdk::Provider for Provider {
         let ServiceSettings { address, .. } =
             load_settings(Some(self.address), config).context("failed to load settings")?;
 
-        let lattice_id = Arc::clone(&self.lattice_id);
-        let host_id = Arc::clone(&self.host_id);
         let components = Arc::clone(&self.components);
+        let host_id = Arc::clone(&self.host_id);
+        let lattice_id = Arc::clone(&self.lattice_id);
         let target_id: Arc<str> = Arc::from(target_id);
-        // Annoyingly, we have to declare a separate clone of the target_id for the closure
-        let target_id_closure = Arc::clone(&target_id);
-        let tasks = listen(
-            address,
+        let tasks = listen(address, {
+            let target_id = Arc::clone(&target_id);
             move |req: hyper::Request<hyper::body::Incoming>| {
-                let target_id = Arc::clone(&target_id_closure);
-                let lattice_id = Arc::clone(&lattice_id);
-                let host_id = Arc::clone(&host_id);
                 let components = Arc::clone(&components);
+                let host_id = Arc::clone(&host_id);
+                let lattice_id = Arc::clone(&lattice_id);
+                let target_id = Arc::clone(&target_id);
                 async move {
                     let component = {
                         let components = components.read().await;
@@ -133,8 +131,8 @@ impl wasmcloud_provider_sdk::Provider for Provider {
                     anyhow::Ok(res)
                 }
                 .instrument(info_span!("handle"))
-            },
-        )
+            }
+        })
         .await?;
 
         self.links

crates/host/src/wasmbus/providers/http_server/path.rs

@@ -128,16 +128,13 @@ impl Provider {
         host_id: Arc<str>,
     ) -> anyhow::Result<Self> {
         let path_router: Arc<RwLock<Router>> = Arc::default();
-
-        // Annoyingly, we have to declare a separate clone of the path_router for the closure
-        let path_router_closure = Arc::clone(&path_router);
-        let handle = listen(
-            address,
+        let handle = listen(address, {
+            let path_router = Arc::clone(&path_router);
             move |req: hyper::Request<hyper::body::Incoming>| {
                 let lattice_id = Arc::clone(&lattice_id);
                 let host_id = Arc::clone(&host_id);
                 let components = Arc::clone(&components);
-                let path_router = Arc::clone(&path_router_closure);
+                let path_router = Arc::clone(&path_router);
                 async move {
                     let (
                         http::request::Parts {
@@ -234,8 +231,8 @@ impl Provider {
                     anyhow::Ok(res)
                 }
                 .instrument(info_span!("handle"))
-            },
-        )
+            }
+        })
         .await
         .context("failed to listen on address for path based http server")?;