address clippy warnings for azure_storage_blobs (#1407)

demoray · web-flow · commit 7af9ed7da04e · 2023-09-20T07:31:04.000-04:00
diff --git a/sdk/storage_blobs/src/blob/operations/acquire_lease.rs b/sdk/storage_blobs/src/blob/operations/acquire_lease.rs
@@ -30,8 +30,7 @@ impl AcquireLeaseBuilder {
             headers.add(self.if_tags);
 
             let mut request =
-                self.client
-                    .finalize_request(url, azure_core::Method::Put, headers, None)?;
+                BlobClient::finalize_request(url, azure_core::Method::Put, headers, None)?;
 
             let response = self.client.send(&mut self.context, &mut request).await?;
 
diff --git a/sdk/storage_blobs/src/blob/operations/append_block.rs b/sdk/storage_blobs/src/blob/operations/append_block.rs
@@ -29,7 +29,7 @@ impl AppendBlockBuilder {
             headers.add(self.if_match);
             headers.add(self.lease_id);
 
-            let mut request = self.client.finalize_request(
+            let mut request = BlobClient::finalize_request(
                 url,
                 azure_core::Method::Put,
                 headers,
diff --git a/sdk/storage_blobs/src/blob/operations/break_lease.rs b/sdk/storage_blobs/src/blob/operations/break_lease.rs
@@ -22,8 +22,7 @@ impl BreakLeaseBuilder {
             headers.add(self.lease_id);
 
             let mut request =
-                self.client
-                    .finalize_request(url, azure_core::Method::Put, headers, None)?;
+                BlobClient::finalize_request(url, azure_core::Method::Put, headers, None)?;
 
             let response = self.client.send(&mut self.context, &mut request).await?;
 
diff --git a/sdk/storage_blobs/src/blob/operations/change_lease.rs b/sdk/storage_blobs/src/blob/operations/change_lease.rs
@@ -27,8 +27,7 @@ impl ChangeLeaseBuilder {
             headers.add(self.if_tags);
 
             let mut request =
-                self.client
-                    .finalize_request(url, azure_core::Method::Put, headers, None)?;
+                BlobLeaseClient::finalize_request(url, azure_core::Method::Put, headers, None)?;
 
             let response = self.client.send(&mut self.context, &mut request).await?;
 
diff --git a/sdk/storage_blobs/src/blob/operations/clear_page.rs b/sdk/storage_blobs/src/blob/operations/clear_page.rs
@@ -33,8 +33,7 @@ impl ClearPageBuilder {
             headers.add(self.lease_id);
 
             let mut request =
-                self.client
-                    .finalize_request(url, azure_core::Method::Put, headers, None)?;
+                BlobClient::finalize_request(url, azure_core::Method::Put, headers, None)?;
 
             let response = self.client.send(&mut self.context, &mut request).await?;
 
diff --git a/sdk/storage_blobs/src/blob/operations/copy_blob.rs b/sdk/storage_blobs/src/blob/operations/copy_blob.rs
@@ -51,8 +51,7 @@ impl CopyBlobBuilder {
             );
 
             let mut request =
-                self.client
-                    .finalize_request(url, azure_core::Method::Put, headers, None)?;
+                BlobClient::finalize_request(url, azure_core::Method::Put, headers, None)?;
 
             let response = self.client.send(&mut self.context, &mut request).await?;
 
diff --git a/sdk/storage_blobs/src/blob/operations/copy_blob_from_url.rs b/sdk/storage_blobs/src/blob/operations/copy_blob_from_url.rs
@@ -48,8 +48,7 @@ impl CopyBlobFromUrlBuilder {
             headers.add(self.source_content_md5);
 
             let mut request =
-                self.client
-                    .finalize_request(url, azure_core::Method::Put, headers, None)?;
+                BlobClient::finalize_request(url, azure_core::Method::Put, headers, None)?;
 
             let response = self.client.send(&mut self.context, &mut request).await?;
 
diff --git a/sdk/storage_blobs/src/blob/operations/delete_blob.rs b/sdk/storage_blobs/src/blob/operations/delete_blob.rs
@@ -28,8 +28,7 @@ impl DeleteBlobBuilder {
             headers.add(self.if_tags);
 
             let mut request =
-                self.client
-                    .finalize_request(url, azure_core::Method::Delete, headers, None)?;
+                BlobClient::finalize_request(url, azure_core::Method::Delete, headers, None)?;
 
             let response = self.client.send(&mut self.context, &mut request).await?;
             DeleteBlobResponse::from_headers(response.headers())
diff --git a/sdk/storage_blobs/src/blob/operations/delete_blob_snapshot.rs b/sdk/storage_blobs/src/blob/operations/delete_blob_snapshot.rs
@@ -24,8 +24,7 @@ impl DeleteBlobSnapshotBuilder {
             headers.add(self.lease_id);
 
             let mut request =
-                self.client
-                    .finalize_request(url, azure_core::Method::Delete, headers, None)?;
+                BlobClient::finalize_request(url, azure_core::Method::Delete, headers, None)?;
 
             let response = self.client.send(&mut self.context, &mut request).await?;
 
diff --git a/sdk/storage_blobs/src/blob/operations/delete_blob_version.rs b/sdk/storage_blobs/src/blob/operations/delete_blob_version.rs
@@ -23,8 +23,7 @@ impl DeleteBlobVersionBuilder {
             headers.add(self.lease_id);
 
             let mut request =
-                self.client
-                    .finalize_request(url, azure_core::Method::Delete, headers, None)?;
+                BlobClient::finalize_request(url, azure_core::Method::Delete, headers, None)?;
 
             let response = self.client.send(&mut self.context, &mut request).await?;
 
diff --git a/sdk/storage_blobs/src/blob/operations/get_blob.rs b/sdk/storage_blobs/src/blob/operations/get_blob.rs
@@ -50,8 +50,7 @@ impl GetBlobBuilder {
                 headers.add(this.if_tags.clone());
 
                 let mut request =
-                    this.client
-                        .finalize_request(url, azure_core::Method::Get, headers, None)?;
+                    BlobClient::finalize_request(url, azure_core::Method::Get, headers, None)?;
 
                 let response = this.client.send(&mut ctx, &mut request).await?;
 
diff --git a/sdk/storage_blobs/src/blob/operations/get_block_list.rs b/sdk/storage_blobs/src/blob/operations/get_block_list.rs
@@ -32,8 +32,7 @@ impl GetBlockListBuilder {
             headers.add(self.if_tags);
 
             let mut request =
-                self.client
-                    .finalize_request(url, azure_core::Method::Get, headers, None)?;
+                BlobClient::finalize_request(url, azure_core::Method::Get, headers, None)?;
 
             let response = self.client.send(&mut self.context, &mut request).await?;
 
diff --git a/sdk/storage_blobs/src/blob/operations/get_metadata.rs b/sdk/storage_blobs/src/blob/operations/get_metadata.rs
@@ -27,9 +27,7 @@ impl GetMetadataBuilder {
             headers.add(self.if_match);
             headers.add(self.if_tags);
 
-            let mut request = self
-                .client
-                .finalize_request(url, Method::Get, headers, None)?;
+            let mut request = BlobClient::finalize_request(url, Method::Get, headers, None)?;
 
             let response = self.client.send(&mut self.context, &mut request).await?;
 
diff --git a/sdk/storage_blobs/src/blob/operations/get_page_ranges.rs b/sdk/storage_blobs/src/blob/operations/get_page_ranges.rs
@@ -28,8 +28,7 @@ impl GetPageRangesBuilder {
             headers.add(self.if_tags);
 
             let mut request =
-                self.client
-                    .finalize_request(url, azure_core::Method::Get, headers, None)?;
+                BlobClient::finalize_request(url, azure_core::Method::Get, headers, None)?;
 
             let response = self.client.send(&mut self.context, &mut request).await?;
 
diff --git a/sdk/storage_blobs/src/blob/operations/get_properties.rs b/sdk/storage_blobs/src/blob/operations/get_properties.rs
@@ -26,8 +26,7 @@ impl GetPropertiesBuilder {
             headers.add(self.if_tags);
 
             let mut request =
-                self.client
-                    .finalize_request(url, azure_core::Method::Head, headers, None)?;
+                BlobClient::finalize_request(url, azure_core::Method::Head, headers, None)?;
 
             let response = self.client.send(&mut self.context, &mut request).await?;
             // TODO: Fix this
diff --git a/sdk/storage_blobs/src/blob/operations/get_tags.rs b/sdk/storage_blobs/src/blob/operations/get_tags.rs
@@ -24,8 +24,7 @@ impl GetTagsBuilder {
             headers.add(self.if_tags);
 
             let mut request =
-                self.client
-                    .finalize_request(url, azure_core::Method::Get, headers, None)?;
+                BlobClient::finalize_request(url, azure_core::Method::Get, headers, None)?;
 
             let response = self.client.send(&mut self.context, &mut request).await?;
 
diff --git a/sdk/storage_blobs/src/blob/operations/put_append_blob.rs b/sdk/storage_blobs/src/blob/operations/put_append_blob.rs
@@ -34,8 +34,7 @@ impl PutAppendBlobBuilder {
             headers.add(self.lease_id);
 
             let mut request =
-                self.client
-                    .finalize_request(url, azure_core::Method::Put, headers, None)?;
+                BlobClient::finalize_request(url, azure_core::Method::Put, headers, None)?;
 
             let response = self.client.send(&mut self.context, &mut request).await?;
             PutBlobResponse::from_headers(response.headers())
diff --git a/sdk/storage_blobs/src/blob/operations/put_block.rs b/sdk/storage_blobs/src/blob/operations/put_block.rs
@@ -23,7 +23,7 @@ impl PutBlockBuilder {
             let mut headers = Headers::new();
             headers.add(self.lease_id);
 
-            let mut request = self.client.finalize_request(
+            let mut request = BlobClient::finalize_request(
                 url,
                 azure_core::Method::Put,
                 headers,
diff --git a/sdk/storage_blobs/src/blob/operations/put_block_blob.rs b/sdk/storage_blobs/src/blob/operations/put_block_blob.rs
@@ -49,7 +49,7 @@ impl PutBlockBlobBuilder {
             headers.add(self.if_match);
             headers.add(self.if_tags);
 
-            let mut request = self.client.finalize_request(
+            let mut request = BlobClient::finalize_request(
                 url,
                 azure_core::Method::Put,
                 headers,
diff --git a/sdk/storage_blobs/src/blob/operations/put_block_list.rs b/sdk/storage_blobs/src/blob/operations/put_block_list.rs
@@ -62,7 +62,7 @@ impl PutBlockListBuilder {
             headers.add(self.if_match);
             headers.add(self.if_tags);
 
-            let mut request = self.client.finalize_request(
+            let mut request = BlobClient::finalize_request(
                 url,
                 azure_core::Method::Put,
                 headers,
diff --git a/sdk/storage_blobs/src/blob/operations/put_block_url.rs b/sdk/storage_blobs/src/blob/operations/put_block_url.rs
@@ -25,8 +25,7 @@ impl PutBlockUrlBuilder {
             headers.add(self.lease_id);
 
             let mut request =
-                self.client
-                    .finalize_request(url, azure_core::Method::Put, headers, None)?;
+                BlobClient::finalize_request(url, azure_core::Method::Put, headers, None)?;
 
             let response = self.client.send(&mut self.context, &mut request).await?;
             PutBlockUrlResponse::from_headers(response.headers())
diff --git a/sdk/storage_blobs/src/blob/operations/put_page.rs b/sdk/storage_blobs/src/blob/operations/put_page.rs
@@ -34,7 +34,7 @@ impl PutPageBuilder {
             headers.add(self.if_tags);
             headers.add(self.lease_id);
 
-            let mut request = self.client.finalize_request(
+            let mut request = BlobClient::finalize_request(
                 url,
                 azure_core::Method::Put,
                 headers,
diff --git a/sdk/storage_blobs/src/blob/operations/put_page_blob.rs b/sdk/storage_blobs/src/blob/operations/put_page_blob.rs
@@ -40,8 +40,7 @@ impl PutPageBlobBuilder {
             headers.add(self.sequence_number);
 
             let mut request =
-                self.client
-                    .finalize_request(url, azure_core::Method::Put, headers, None)?;
+                BlobClient::finalize_request(url, azure_core::Method::Put, headers, None)?;
 
             let response = self.client.send(&mut self.context, &mut request).await?;
             PutBlobResponse::from_headers(response.headers())
diff --git a/sdk/storage_blobs/src/blob/operations/release_lease.rs b/sdk/storage_blobs/src/blob/operations/release_lease.rs
@@ -25,8 +25,7 @@ impl ReleaseLeaseBuilder {
             headers.add(self.if_tags);
 
             let mut request =
-                self.client
-                    .finalize_request(url, azure_core::Method::Put, headers, None)?;
+                BlobLeaseClient::finalize_request(url, azure_core::Method::Put, headers, None)?;
 
             let response = self.client.send(&mut self.context, &mut request).await?;
 
diff --git a/sdk/storage_blobs/src/blob/operations/renew_lease.rs b/sdk/storage_blobs/src/blob/operations/renew_lease.rs
@@ -25,8 +25,7 @@ impl RenewLeaseBuilder {
             headers.add(self.if_tags);
 
             let mut request =
-                self.client
-                    .finalize_request(url, azure_core::Method::Put, headers, None)?;
+                BlobLeaseClient::finalize_request(url, azure_core::Method::Put, headers, None)?;
 
             let response = self.client.send(&mut self.context, &mut request).await?;
 
diff --git a/sdk/storage_blobs/src/blob/operations/set_blob_tier.rs b/sdk/storage_blobs/src/blob/operations/set_blob_tier.rs
@@ -27,8 +27,7 @@ impl SetBlobTierBuilder {
             headers.add(self.if_tags);
 
             let mut request =
-                self.client
-                    .finalize_request(url, azure_core::Method::Put, headers, None)?;
+                BlobClient::finalize_request(url, azure_core::Method::Put, headers, None)?;
 
             let response = self.client.send(&mut self.context, &mut request).await?;
             response.headers().try_into()
diff --git a/sdk/storage_blobs/src/blob/operations/set_expiry.rs b/sdk/storage_blobs/src/blob/operations/set_expiry.rs
@@ -19,8 +19,7 @@ impl SetBlobExpiryBuilder {
             headers.add(self.lease_id);
 
             let mut request =
-                self.client
-                    .finalize_request(url, azure_core::Method::Put, headers, None)?;
+                BlobClient::finalize_request(url, azure_core::Method::Put, headers, None)?;
 
             let response = self.client.send(&mut self.context, &mut request).await?;
             response.try_into()
diff --git a/sdk/storage_blobs/src/blob/operations/set_metadata.rs b/sdk/storage_blobs/src/blob/operations/set_metadata.rs
@@ -31,9 +31,7 @@ impl SetMetadataBuilder {
                 }
             }
 
-            let mut request = self
-                .client
-                .finalize_request(url, Method::Put, headers, None)?;
+            let mut request = BlobClient::finalize_request(url, Method::Put, headers, None)?;
 
             let response = self.client.send(&mut self.context, &mut request).await?;
             response.headers().try_into()
diff --git a/sdk/storage_blobs/src/blob/operations/set_properties.rs b/sdk/storage_blobs/src/blob/operations/set_properties.rs
@@ -25,6 +25,7 @@ operation! {
 }
 
 impl SetPropertiesBuilder {
+    #[must_use]
     pub fn set_from_blob_properties(self, blob_properties: BlobProperties) -> Self {
         let mut s = self;
 
@@ -67,9 +68,7 @@ impl SetPropertiesBuilder {
             headers.add(self.if_match);
             headers.add(self.if_tags);
 
-            let mut request = self
-                .client
-                .finalize_request(url, Method::Put, headers, None)?;
+            let mut request = BlobClient::finalize_request(url, Method::Put, headers, None)?;
 
             let response = self.client.send(&mut self.context, &mut request).await?;
             response.headers().try_into()
diff --git a/sdk/storage_blobs/src/blob/operations/set_tags.rs b/sdk/storage_blobs/src/blob/operations/set_tags.rs
@@ -28,8 +28,7 @@ impl SetTagsBuilder {
             let body = self.tags.to_xml()?;
 
             let mut request =
-                self.client
-                    .finalize_request(url, Method::Put, headers, Some(body.into()))?;
+                BlobClient::finalize_request(url, Method::Put, headers, Some(body.into()))?;
 
             let response = self.client.send(&mut self.context, &mut request).await?;
             response.headers().try_into()
diff --git a/sdk/storage_blobs/src/blob/operations/snapshot_blob.rs b/sdk/storage_blobs/src/blob/operations/snapshot_blob.rs
@@ -36,7 +36,7 @@ impl SnapshotBlobBuilder {
                 }
             }
 
-            let mut request = self.client.finalize_request(url, Put, headers, None)?;
+            let mut request = BlobClient::finalize_request(url, Put, headers, None)?;
 
             let response = self.client.send(&mut self.context, &mut request).await?;
             response.headers().try_into()
diff --git a/sdk/storage_blobs/src/clients/blob_client.rs b/sdk/storage_blobs/src/clients/blob_client.rs
@@ -301,20 +301,18 @@ impl BlobClient {
         let mut url = self.container_client().url()?;
         let parts = self.blob_name().trim_matches('/').split('/');
         url.path_segments_mut()
-            .map_err(|_| Error::message(ErrorKind::DataConversion, "Invalid url"))?
+            .map_err(|()| Error::message(ErrorKind::DataConversion, "Invalid url"))?
             .extend(parts);
         Ok(url)
     }
 
     pub(crate) fn finalize_request(
-        &self,
         url: Url,
         method: Method,
         headers: Headers,
         request_body: Option<Body>,
     ) -> azure_core::Result<Request> {
-        self.container_client
-            .finalize_request(url, method, headers, request_body)
+        ContainerClient::finalize_request(url, method, headers, request_body)
     }
 
     pub(crate) async fn send(
diff --git a/sdk/storage_blobs/src/clients/blob_lease_client.rs b/sdk/storage_blobs/src/clients/blob_lease_client.rs
@@ -44,14 +44,12 @@ impl BlobLeaseClient {
     }
 
     pub(crate) fn finalize_request(
-        &self,
         url: Url,
         method: Method,
         headers: Headers,
         request_body: Option<Body>,
     ) -> azure_core::Result<Request> {
-        self.blob_client
-            .finalize_request(url, method, headers, request_body)
+        BlobClient::finalize_request(url, method, headers, request_body)
     }
 
     pub(crate) async fn send(
diff --git a/sdk/storage_blobs/src/clients/blob_service_client.rs b/sdk/storage_blobs/src/clients/blob_service_client.rs
@@ -199,7 +199,6 @@ impl BlobServiceClient {
     }
 
     pub(crate) fn finalize_request(
-        &self,
         url: Url,
         method: Method,
         headers: Headers,
diff --git a/sdk/storage_blobs/src/clients/container_client.rs b/sdk/storage_blobs/src/clients/container_client.rs
@@ -153,7 +153,7 @@ impl ContainerClient {
     pub fn url(&self) -> azure_core::Result<url::Url> {
         let mut url = self.service_client.url()?;
         url.path_segments_mut()
-            .map_err(|_| Error::message(ErrorKind::DataConversion, "Invalid url"))?
+            .map_err(|()| Error::message(ErrorKind::DataConversion, "Invalid url"))?
             .push(self.container_name());
         Ok(url)
     }
@@ -171,14 +171,12 @@ impl ContainerClient {
     }
 
     pub(crate) fn finalize_request(
-        &self,
         url: Url,
         method: Method,
         headers: Headers,
         request_body: Option<Body>,
     ) -> azure_core::Result<Request> {
-        self.service_client
-            .finalize_request(url, method, headers, request_body)
+        BlobServiceClient::finalize_request(url, method, headers, request_body)
     }
 }
 
diff --git a/sdk/storage_blobs/src/clients/container_lease_client.rs b/sdk/storage_blobs/src/clients/container_lease_client.rs
diff --git a/sdk/storage_blobs/src/container/mod.rs b/sdk/storage_blobs/src/container/mod.rs
diff --git a/sdk/storage_blobs/src/container/operations/acquire_lease.rs b/sdk/storage_blobs/src/container/operations/acquire_lease.rs
diff --git a/sdk/storage_blobs/src/container/operations/break_lease.rs b/sdk/storage_blobs/src/container/operations/break_lease.rs
diff --git a/sdk/storage_blobs/src/container/operations/create.rs b/sdk/storage_blobs/src/container/operations/create.rs
diff --git a/sdk/storage_blobs/src/container/operations/delete.rs b/sdk/storage_blobs/src/container/operations/delete.rs
diff --git a/sdk/storage_blobs/src/container/operations/get_acl.rs b/sdk/storage_blobs/src/container/operations/get_acl.rs
diff --git a/sdk/storage_blobs/src/container/operations/get_properties.rs b/sdk/storage_blobs/src/container/operations/get_properties.rs
diff --git a/sdk/storage_blobs/src/container/operations/list_blobs.rs b/sdk/storage_blobs/src/container/operations/list_blobs.rs
diff --git a/sdk/storage_blobs/src/container/operations/release_lease.rs b/sdk/storage_blobs/src/container/operations/release_lease.rs
diff --git a/sdk/storage_blobs/src/container/operations/renew_lease.rs b/sdk/storage_blobs/src/container/operations/renew_lease.rs
diff --git a/sdk/storage_blobs/src/container/operations/set_acl.rs b/sdk/storage_blobs/src/container/operations/set_acl.rs
diff --git a/sdk/storage_blobs/src/options/encryption_key.rs b/sdk/storage_blobs/src/options/encryption_key.rs
diff --git a/sdk/storage_blobs/src/service/operations/find_blobs_by_tags.rs b/sdk/storage_blobs/src/service/operations/find_blobs_by_tags.rs
diff --git a/sdk/storage_blobs/src/service/operations/get_account_information.rs b/sdk/storage_blobs/src/service/operations/get_account_information.rs
diff --git a/sdk/storage_blobs/src/service/operations/list_containers.rs b/sdk/storage_blobs/src/service/operations/list_containers.rs
