Fix clippy lints

Author: johnbatty

sdk/identity/examples/device_code_flow.rs

@@ -78,13 +78,13 @@ async fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
     // using the access token.
 
     let http_client = azure_core::new_http_client();
-    let storage_client = StorageAccountClient::new_bearer_token(
+    let storage_account = StorageAccountClient::new_bearer_token(
         http_client.clone(),
         &storage_account_name,
         authorization.access_token().secret() as &str,
     )
     .as_storage_client();
-    let blob_service = storage.as_blob_service_client();
+    let blob_service = storage_account.as_blob_service_client();
 
     // now we enumerate the containers in the
     // specified storage account.

sdk/storage_blobs/examples/list_blobs_01.rs

@@ -17,20 +17,12 @@ async fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
         .nth(1)
         .expect("please specify container name as command line parameter");
 
-<<<<<<< HEAD
     let http_client = azure_core::new_http_client();
     let storage_account =
         StorageAccountClient::new_access_key(http_client.clone(), &account, &master_key)
             .as_storage_client();
-    let base_blob_service = storage_account.as_base_blob_service();
+    let blob_service = storage_account.as_blob_service_client();
     let container = storage_account.as_container_client(&container_name);
-=======
-    let http_client = new_http_client();
-    let storage = StorageAccountClient::new_access_key(http_client.clone(), &account, &master_key)
-        .as_storage_client();
-    let blob_service = storage.as_blob_service_client();
-    let container = storage.as_container_client(&container_name);
->>>>>>> Rename BaseBlobService to BlobServiceClient.
 
     let iv = blob_service.list_containers().execute().await?;
 

sdk/storage_blobs/src/clients/blob_client.rs

@@ -89,11 +89,11 @@ impl BlobClient {
         SetBlobMetadataBuilder::new(self)
     }
 
-    pub fn update_page<'a>(
-        &'a self,
+    pub fn update_page(
+        &self,
         ba512_range: BA512Range,
         content: impl Into<Bytes>,
-    ) -> UpdatePageBuilder<'a> {
+    ) -> UpdatePageBuilder {
         UpdatePageBuilder::new(self, ba512_range, content)
     }
 
@@ -133,19 +133,19 @@ impl BlobClient {
         PutBlockListBuilder::new(self, block_list)
     }
 
-    pub fn put_block_blob<'a>(&'a self, body: impl Into<Bytes>) -> PutBlockBlobBuilder<'a> {
+    pub fn put_block_blob(&self, body: impl Into<Bytes>) -> PutBlockBlobBuilder {
         PutBlockBlobBuilder::new(self, body.into())
     }
 
-    pub fn append_block<'a>(&'a self, body: impl Into<Bytes>) -> AppendBlockBuilder<'a> {
+    pub fn append_block(&self, body: impl Into<Bytes>) -> AppendBlockBuilder {
         AppendBlockBuilder::new(self, body.into())
     }
 
-    pub fn put_block<'a>(
-        &'a self,
+    pub fn put_block(
+        &self,
         block_id: impl Into<BlockId>,
         body: impl Into<Bytes>,
-    ) -> PutBlockBuilder<'a> {
+    ) -> PutBlockBuilder {
         PutBlockBuilder::new(self, block_id, body)
     }
 

sdk/storage_blobs/src/clients/blob_lease_client.rs

@@ -69,11 +69,11 @@ impl BlobLeaseClient {
         ChangeLeaseBuilder::new(self, proposed_lease_id)
     }
 
-    pub fn release<'a>(&'a self) -> ReleaseLeaseBuilder {
+    pub fn release(&self) -> ReleaseLeaseBuilder {
         ReleaseLeaseBuilder::new(self)
     }
 
-    pub fn renew<'a>(&'a self) -> RenewLeaseBuilder {
+    pub fn renew(&self) -> RenewLeaseBuilder {
         RenewLeaseBuilder::new(self)
     }