WIP:Fix hyper usage

src/api/adapter/local.rs

@@ -12,8 +12,15 @@ use async_std::prelude::*;
 
 use crate::api::adapter::MockServerAdapter;
 
-use crate::common::data::{ActiveMock, ClosestMatch, MockDefinition, MockRef, ProxyMatcherRef, RecordingMatcherRef, RequestRequirements};
-use crate::server::web::handlers::{add_new_mock, add_proxy_matcher, add_recording_matcher, delete_all_mocks, delete_all_proxy_matchers, delete_all_recording_matchers, delete_history, delete_one_mock, read_one_mock, reset, verify};
+use crate::common::data::{
+    ActiveMock, ClosestMatch, MockDefinition, MockRef, ProxyMatcherRef, RecordingMatcherRef,
+    RequestRequirements,
+};
+use crate::server::web::handlers::{
+    add_new_mock, add_proxy_matcher, add_recording_matcher, delete_all_mocks,
+    delete_all_proxy_matchers, delete_all_recording_matchers, delete_history, delete_one_mock,
+    read_one_mock, reset, verify,
+};
 use crate::server::MockServerState;
 
 pub struct LocalMockServerAdapter {
@@ -115,16 +122,22 @@ impl MockServerAdapter for LocalMockServerAdapter {
         Ok(())
     }
 
-    async fn create_proxy_matcher(&self, req: RequestRequirements) -> Result<ProxyMatcherRef, String> {
+    async fn create_proxy_matcher(
+        &self,
+        req: RequestRequirements,
+    ) -> Result<ProxyMatcherRef, String> {
         add_proxy_matcher(&self.local_state, req)
     }
 
     async fn delete_all_proxy_matchers(&self) -> Result<(), String> {
-       delete_all_proxy_matchers(&self.local_state);
+        delete_all_proxy_matchers(&self.local_state);
         Ok(())
     }
 
-    async fn create_record_matcher(&self, req: RequestRequirements) -> Result<RecordingMatcherRef, String> {
+    async fn create_record_matcher(
+        &self,
+        req: RequestRequirements,
+    ) -> Result<RecordingMatcherRef, String> {
         add_recording_matcher(&self.local_state, req)
     }
 

src/api/adapter/mod.rs

@@ -7,7 +7,10 @@ use async_trait::async_trait;
 
 use serde::{Deserialize, Serialize};
 
-use crate::common::data::{ActiveMock, ClosestMatch, MockDefinition, MockRef, ProxyMatcherRef, RecordingMatcherRef, RequestRequirements};
+use crate::common::data::{
+    ActiveMock, ClosestMatch, MockDefinition, MockRef, ProxyMatcherRef, RecordingMatcherRef,
+    RequestRequirements,
+};
 use crate::server::web::handlers::{
     add_new_mock, delete_all_mocks, delete_history, delete_one_mock, read_one_mock, verify,
 };
@@ -77,9 +80,15 @@ pub trait MockServerAdapter {
     async fn verify(&self, rr: &RequestRequirements) -> Result<Option<ClosestMatch>, String>;
     async fn delete_history(&self) -> Result<(), String>;
     async fn ping(&self) -> Result<(), String>;
-    async fn create_proxy_matcher(&self, req: RequestRequirements) -> Result<(ProxyMatcherRef), String>;
+    async fn create_proxy_matcher(
+        &self,
+        req: RequestRequirements,
+    ) -> Result<(ProxyMatcherRef), String>;
     async fn delete_all_proxy_matchers(&self) -> Result<(), String>;
-    async fn create_record_matcher(&self, req: RequestRequirements) -> Result<(RecordingMatcherRef), String>;
+    async fn create_record_matcher(
+        &self,
+        req: RequestRequirements,
+    ) -> Result<(RecordingMatcherRef), String>;
     async fn delete_all_record_matchers(&self) -> Result<(), String>;
     async fn reset(&self) -> Result<(), String>;
 }

src/api/adapter/standalone.rs

@@ -250,7 +250,6 @@ impl MockServerAdapter for RemoteMockServerAdapter {
     async fn ping(&self) -> Result<(), String> {
         http_ping(&self.addr, self.http_client.borrow()).await
     }
-
 }
 
 async fn http_ping(

src/api/server.rs

@@ -1,3 +1,4 @@
+use crate::api::mock::{ProxyMatcher, RecordingMatcher};
 use crate::api::spec::{Then, When};
 #[cfg(feature = "remote")]
 use crate::api::RemoteMockServerAdapter;
@@ -14,7 +15,6 @@ use std::rc::Rc;
 use std::sync::Arc;
 use std::thread;
 use tokio::task::LocalSet;
-use crate::api::mock::{ProxyMatcher, RecordingMatcher};
 
 /// A mock server that is able to receive and respond to HTTP requests.
 pub struct MockServer {
@@ -328,15 +328,22 @@ impl MockServer {
         }
     }
 
-
-    pub fn proxy<F>(&self, host: F) -> ProxyMatcher where F: FnOnce(When)  {
+    pub fn proxy<F>(&self, host: F) -> ProxyMatcher
+    where
+        F: FnOnce(When),
+    {
         self.proxy_async(host).join()
     }
 
-    pub async fn proxy_async<F>(&self, spec_fn: F) -> ProxyMatcher where F: FnOnce(When)  {
+    pub async fn proxy_async<F>(&self, spec_fn: F) -> ProxyMatcher
+    where
+        F: FnOnce(When),
+    {
         let mut req = Rc::new(Cell::new(RequestRequirements::new()));
 
-        spec_fn(When { expectations: req.clone() });
+        spec_fn(When {
+            expectations: req.clone(),
+        });
 
         let response = self
             .server_adapter
@@ -352,15 +359,22 @@ impl MockServer {
         }
     }
 
-
-    pub fn record<F>(&self, host: F) -> RecordingMatcher where F: FnOnce(When)  {
+    pub fn record<F>(&self, host: F) -> RecordingMatcher
+    where
+        F: FnOnce(When),
+    {
         self.record_async(host).join()
     }
 
-    pub async fn record_async<F>(&self, spec_fn: F) -> RecordingMatcher  where F: FnOnce(When){
+    pub async fn record_async<F>(&self, spec_fn: F) -> RecordingMatcher
+    where
+        F: FnOnce(When),
+    {
         let mut req = Rc::new(Cell::new(RequestRequirements::new()));
 
-        spec_fn(When { expectations: req.clone() });
+        spec_fn(When {
+            expectations: req.clone(),
+        });
 
         let response = self
             .server_adapter
@@ -375,7 +389,6 @@ impl MockServer {
             server: self,
         }
     }
-
 }
 
 impl Drop for MockServer {

src/common/data.rs

@@ -371,7 +371,6 @@ impl RecordingMatcherRef {
     }
 }
 
-
 #[derive(Serialize, Deserialize, Clone)]
 pub struct ActiveProxyMatcher {
     pub id: usize,