Removed remaining generics

Author: MindFlavor

azure_sdk_storage_table/src/cloud_table.rs

@@ -62,7 +62,7 @@ where
             &Method::GET,
             None,
             MetadataDetail::None, // etag is provided through header, no extra meta info is required
-            |mut request| {
+            &|mut request| {
                 if let Some(etag) = etag {
                     request = request.header(header::IF_MATCH, etag);
                 }
@@ -105,7 +105,7 @@ where
             &Method::POST,
             Some(&obj_ser),
             MetadataDetail::None,
-            |req| req,
+            &|req| req,
         )?;
 
         let (headers, body) =
@@ -151,7 +151,7 @@ where
             &Method::PUT,
             Some(&obj_ser),
             MetadataDetail::None,
-            |req| req,
+            &|req| req,
         )?;
         let (headers, _body) =
             check_status_extract_headers_and_body(future_response, StatusCode::NO_CONTENT).await?;
@@ -194,8 +194,8 @@ where
             &Method::PUT,
             Some(&obj_ser),
             MetadataDetail::None,
-            |mut request| {
-                if let Some(etag) = etag {
+            &|mut request| {
+                if let Some(etag) = &etag {
                     request = request.header(header::IF_MATCH, etag);
                 }
                 request
@@ -234,7 +234,7 @@ where
             &Method::DELETE,
             None,
             MetadataDetail::None,
-            |request| request.header(header::IF_MATCH, etag),
+            &|request| request.header(header::IF_MATCH, etag),
         )?;
 
         check_status_extract_body(future_response, StatusCode::NO_CONTENT).await?;
@@ -284,7 +284,7 @@ where
             &Method::GET,
             None,
             MetadataDetail::Full, // etag is provided through metadata only
-            |req| req,
+            &|req| req,
         )?;
 
         let (headers, body) =
@@ -318,7 +318,7 @@ where
 
         let future_response =
             self.client
-                .request("$batch", &Method::POST, Some(&payload), |request| {
+                .request("$batch", &Method::POST, Some(&payload), &|request| {
                     request.header(
                         header::CONTENT_TYPE,
                         header::HeaderValue::from_static(get_batch_mime()),

azure_sdk_storage_table/src/table_client.rs

@@ -1,9 +1,11 @@
 use azure_sdk_core::errors::{check_status_extract_body, AzureError};
+use azure_sdk_storage_core::key_client::KeyClient;
 use azure_sdk_storage_core::prelude::*;
 use azure_sdk_storage_core::{
     client, get_default_json_mime, get_json_mime_fullmetadata, get_json_mime_nometadata,
     ConnectionString, ServiceType,
 };
+use http::request::Builder;
 use hyper::{
     client::ResponseFuture,
     header::{self, HeaderValue},
@@ -91,7 +93,7 @@ where
             &Method::GET,
             None,
             MetadataDetail::None,
-            |req| req,
+            &|req| req,
         )?;
         let body = check_status_extract_body(future_response, StatusCode::OK).await?;
         let entities = serde_json::from_str::<TableDataCollection>(&body)?;
@@ -112,7 +114,7 @@ where
             &Method::POST,
             Some(body),
             MetadataDetail::None,
-            |req| req,
+            &|req| req,
         )?;
 
         check_status_extract_body(future_response, StatusCode::CREATED).await?;
@@ -123,18 +125,15 @@ where
         self.client.get_uri_prefix(ServiceType::Table)
     }
 
-    pub(crate) fn request_with_default_header<F>(
+    pub(crate) fn request_with_default_header(
         &self,
         segment: &str,
         method: &Method,
         request_str: Option<&str>,
         metadata: MetadataDetail,
-        request_extra: F,
-    ) -> Result<ResponseFuture, AzureError>
-    where
-        F: FnOnce(::http::request::Builder) -> ::http::request::Builder,
-    {
-        self.request(segment, method, request_str, |mut request| {
+        http_header_adder: &dyn Fn(Builder) -> Builder,
+    ) -> Result<ResponseFuture, AzureError> {
+        self.request(segment, method, request_str, &|mut request| {
             request = match metadata {
                 MetadataDetail::Full => request.header(
                     header::ACCEPT,
@@ -156,20 +155,17 @@ where
                 );
             }
 
-            request_extra(request)
+            http_header_adder(request)
         })
     }
 
-    pub(crate) fn request<F>(
+    pub(crate) fn request(
         &self,
         segment: &str,
         method: &Method,
         request_str: Option<&str>,
-        request_extra: F,
-    ) -> Result<ResponseFuture, AzureError>
-    where
-        F: FnOnce(::http::request::Builder) -> ::http::request::Builder,
-    {
+        http_header_adder: &dyn Fn(Builder) -> Builder,
+    ) -> Result<ResponseFuture, AzureError> {
         log::trace!("{:?} {}", method, segment);
         if let Some(body) = request_str {
             log::trace!("Request: {}", body);
@@ -181,7 +177,7 @@ where
         };
 
         self.client
-            .perform_table_request(segment, method, request_extra, request_vec)
+            .perform_table_request(segment, method, http_header_adder, request_vec)
     }
 }