address issues raised by clippy in 1.60.0 (Azure#719)

bmc-msft · Brian Caswell · web-flow · commit 99bbaefeec27 · 2022-04-08T16:27:30.000+02:00
Co-authored-by: Brian Caswell &lt;bcaswell@microsoft.com&gt;
diff --git a/sdk/data_cosmos/examples/attachments_00.rs b/sdk/data_cosmos/examples/attachments_00.rs
@@ -16,7 +16,7 @@ impl azure_data_cosmos::CosmosEntity for MySampleStruct {
     type Entity = String;
 
     fn partition_key(&self) -> Self::Entity {
-        self.id.clone().into()
+        self.id.clone()
     }
 }
 
diff --git a/sdk/device_update/examples/list_operations.rs b/sdk/device_update/examples/list_operations.rs
@@ -24,14 +24,14 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
     let s_filter = env::var("DEVICE_UPDATE_FILTER").unwrap_or_default();
 
     let mut filter: Option<&str> = None;
-    if s_filter.len() != 0 {
+    if !s_filter.is_empty() {
         filter = Some(&s_filter);
     }
 
     let s_top = env::var("DEVICE_UPDATE_TOP").unwrap_or_default();
 
     let mut top: Option<&str> = None;
-    if s_top.len() != 0 {
+    if !s_top.is_empty() {
         top = Some(&s_top);
     }
 
diff --git a/sdk/device_update/examples/list_updates.rs b/sdk/device_update/examples/list_updates.rs
@@ -23,13 +23,13 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
 
     let s_filter = env::var("DEVICE_UPDATE_FILTER").unwrap_or_default();
     let mut filter: Option<&str> = None;
-    if s_filter.len() != 0 {
+    if !s_filter.is_empty() {
         filter = Some(&s_filter);
     }
 
     let s_search = env::var("DEVICE_UPDATE_SEARCH").unwrap_or_default();
     let mut search: Option<&str> = None;
-    if s_search.len() != 0 {
+    if !s_search.is_empty() {
         search = Some(&s_search);
     }
 
diff --git a/sdk/device_update/examples/list_versions.rs b/sdk/device_update/examples/list_versions.rs
@@ -28,7 +28,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
     let s_filter = env::var("DEVICE_UPDATE_FILTER").unwrap_or_default();
 
     let mut filter: Option<&str> = None;
-    if s_filter.len() != 0 {
+    if !s_filter.is_empty() {
         filter = Some(&s_filter);
     }
 
diff --git a/sdk/iot_hub/src/service/requests/create_or_update_device_identity_builder.rs b/sdk/iot_hub/src/service/requests/create_or_update_device_identity_builder.rs
@@ -79,12 +79,11 @@ impl<'a> CreateOrUpdateDeviceIdentityBuilder<'a> {
         let body = azure_core::to_json(&body)?;
         let request = request.body(body)?;
 
-        Ok(self
-            .service_client
+        self.service_client
             .http_client()
             .execute_request_check_status(request, http::StatusCode::OK)
             .await?
-            .try_into()?)
+            .try_into()
     }
 }
 
diff --git a/sdk/iot_hub/src/service/requests/create_or_update_module_identity_builder.rs b/sdk/iot_hub/src/service/requests/create_or_update_module_identity_builder.rs
@@ -69,12 +69,11 @@ impl<'a> CreateOrUpdateModuleIdentityBuilder<'a> {
         let body = azure_core::to_json(&body)?;
         let request = request.body(body)?;
 
-        Ok(self
-            .service_client
+        self.service_client
             .http_client()
             .execute_request_check_status(request, http::StatusCode::OK)
             .await?
-            .try_into()?)
+            .try_into()
     }
 }
 
diff --git a/sdk/iot_hub/src/service/requests/get_identity.rs b/sdk/iot_hub/src/service/requests/get_identity.rs
@@ -28,9 +28,9 @@ where
     let request = service_client.prepare_request(&uri, Method::GET);
     let request = request.body(azure_core::EMPTY_BODY)?;
 
-    Ok(service_client
+    service_client
         .http_client()
         .execute_request_check_status(request, StatusCode::OK)
         .await?
-        .try_into()?)
+        .try_into()
 }
diff --git a/sdk/iot_hub/src/service/requests/get_twin.rs b/sdk/iot_hub/src/service/requests/get_twin.rs
@@ -29,9 +29,9 @@ where
     let request = service_client.prepare_request(&uri, Method::GET);
     let request = request.body(azure_core::EMPTY_BODY)?;
 
-    Ok(service_client
+    service_client
         .http_client()
         .execute_request_check_status(request, StatusCode::OK)
         .await?
-        .try_into()?)
+        .try_into()
 }
diff --git a/sdk/iot_hub/src/service/requests/invoke_method_builder.rs b/sdk/iot_hub/src/service/requests/invoke_method_builder.rs
@@ -85,12 +85,11 @@ impl<'a> InvokeMethodBuilder<'a> {
 
         let request = request.body(body)?;
 
-        Ok(self
-            .iot_hub_service
+        self.iot_hub_service
             .http_client()
             .execute_request_check_status(request, StatusCode::OK)
             .await?
-            .try_into()?)
+            .try_into()
     }
 }
 
diff --git a/sdk/iot_hub/src/service/requests/update_or_replace_twin_builder.rs b/sdk/iot_hub/src/service/requests/update_or_replace_twin_builder.rs
@@ -156,12 +156,11 @@ where
 
         let request = request.body(body)?;
 
-        Ok(self
-            .service_client
+        self.service_client
             .http_client()
             .execute_request_check_status(request, StatusCode::OK)
             .await?
-            .try_into()?)
+            .try_into()
     }
 }
 
diff --git a/sdk/security_keyvault/src/certificate.rs b/sdk/security_keyvault/src/certificate.rs
@@ -169,7 +169,7 @@ impl<'a, T: TokenCredential> CertificateClient<'a, T> {
     /// Runtime::new().unwrap().block_on(example());
     /// ```
     pub async fn get_certificate(&mut self, name: &'a str) -> Result<KeyVaultCertificate, Error> {
-        Ok(self.get_certificate_with_version(name, "").await?)
+        self.get_certificate_with_version(name, "").await
     }
 
     /// Gets a certificate from the Key Vault with a specific version.
diff --git a/sdk/security_keyvault/src/secret.rs b/sdk/security_keyvault/src/secret.rs
@@ -116,7 +116,7 @@ impl<'a, T: TokenCredential> KeyClient<'a, T> {
     /// Runtime::new().unwrap().block_on(example());
     /// ```
     pub async fn get_secret(&mut self, secret_name: &str) -> Result<KeyVaultSecret, Error> {
-        Ok(self.get_secret_with_version(secret_name, "").await?)
+        self.get_secret_with_version(secret_name, "").await
     }
 
     /// Gets a secret from the Key Vault with a specific version.
diff --git a/sdk/storage_blobs/examples/stream_blob_01.rs b/sdk/storage_blobs/examples/stream_blob_01.rs
@@ -39,9 +39,9 @@ async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
     Ok(())
 }
 
-fn get_blob_stream<'a>(
-    blob_client: &'a BlobClient,
-) -> impl futures::Stream<Item = Result<GetBlobResponse, Box<dyn std::error::Error + Send + Sync>>> + 'a
+fn get_blob_stream(
+    blob_client: &'_ BlobClient,
+) -> impl futures::Stream<Item = Result<GetBlobResponse, Box<dyn std::error::Error + Send + Sync>>> + '_
 {
     let stream = blob_client.get().stream(1024);
     stream

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ impl azure_data_cosmos::CosmosEntity for MySampleStruct {`
`16`	`16`	`type Entity = String;`
`17`	`17`
`18`	`18`	`fn partition_key(&self) -> Self::Entity {`
`19`		`- self.id.clone().into()`
	`19`	`+ self.id.clone()`
`20`	`20`	`}`
`21`	`21`	`}`
`22`	`22`
Original file line number	Diff line number	Diff line change
`@@ -24,14 +24,14 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {`
`24`	`24`	`let s_filter = env::var("DEVICE_UPDATE_FILTER").unwrap_or_default();`
`25`	`25`
`26`	`26`	`let mut filter: Option<&str> = None;`
`27`		`- if s_filter.len() != 0 {`
	`27`	`+ if !s_filter.is_empty() {`
`28`	`28`	`filter = Some(&s_filter);`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`let s_top = env::var("DEVICE_UPDATE_TOP").unwrap_or_default();`
`32`	`32`
`33`	`33`	`let mut top: Option<&str> = None;`
`34`		`- if s_top.len() != 0 {`
	`34`	`+ if !s_top.is_empty() {`
`35`	`35`	`top = Some(&s_top);`
`36`	`36`	`}`
`37`	`37`
Original file line number	Diff line number	Diff line change
`@@ -23,13 +23,13 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {`
`23`	`23`
`24`	`24`	`let s_filter = env::var("DEVICE_UPDATE_FILTER").unwrap_or_default();`
`25`	`25`	`let mut filter: Option<&str> = None;`
`26`		`- if s_filter.len() != 0 {`
	`26`	`+ if !s_filter.is_empty() {`
`27`	`27`	`filter = Some(&s_filter);`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`let s_search = env::var("DEVICE_UPDATE_SEARCH").unwrap_or_default();`
`31`	`31`	`let mut search: Option<&str> = None;`
`32`		`- if s_search.len() != 0 {`
	`32`	`+ if !s_search.is_empty() {`
`33`	`33`	`search = Some(&s_search);`
`34`	`34`	`}`
`35`	`35`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {`
`28`	`28`	`let s_filter = env::var("DEVICE_UPDATE_FILTER").unwrap_or_default();`
`29`	`29`
`30`	`30`	`let mut filter: Option<&str> = None;`
`31`		`- if s_filter.len() != 0 {`
	`31`	`+ if !s_filter.is_empty() {`
`32`	`32`	`filter = Some(&s_filter);`
`33`	`33`	`}`
`34`	`34`
Original file line number	Diff line number	Diff line change
`@@ -79,12 +79,11 @@ impl<'a> CreateOrUpdateDeviceIdentityBuilder<'a> {`
`79`	`79`	`let body = azure_core::to_json(&body)?;`
`80`	`80`	`let request = request.body(body)?;`
`81`	`81`
`82`		`- Ok(self`
`83`		`- .service_client`
	`82`	`+ self.service_client`
`84`	`83`	`.http_client()`
`85`	`84`	`.execute_request_check_status(request, http::StatusCode::OK)`
`86`	`85`	`.await?`
`87`		`- .try_into()?)`
	`86`	`+ .try_into()`
`88`	`87`	`}`
`89`	`88`	`}`
`90`	`89`
Original file line number	Diff line number	Diff line change
`@@ -69,12 +69,11 @@ impl<'a> CreateOrUpdateModuleIdentityBuilder<'a> {`
`69`	`69`	`let body = azure_core::to_json(&body)?;`
`70`	`70`	`let request = request.body(body)?;`
`71`	`71`
`72`		`- Ok(self`
`73`		`- .service_client`
	`72`	`+ self.service_client`
`74`	`73`	`.http_client()`
`75`	`74`	`.execute_request_check_status(request, http::StatusCode::OK)`
`76`	`75`	`.await?`
`77`		`- .try_into()?)`
	`76`	`+ .try_into()`
`78`	`77`	`}`
`79`	`78`	`}`
`80`	`79`
Original file line number	Diff line number	Diff line change
`@@ -85,12 +85,11 @@ impl<'a> InvokeMethodBuilder<'a> {`
`85`	`85`
`86`	`86`	`let request = request.body(body)?;`
`87`	`87`
`88`		`- Ok(self`
`89`		`- .iot_hub_service`
	`88`	`+ self.iot_hub_service`
`90`	`89`	`.http_client()`
`91`	`90`	`.execute_request_check_status(request, StatusCode::OK)`
`92`	`91`	`.await?`
`93`		`- .try_into()?)`
	`92`	`+ .try_into()`
`94`	`93`	`}`
`95`	`94`	`}`
`96`	`95`
Original file line number	Diff line number	Diff line change
`@@ -156,12 +156,11 @@ where`
`156`	`156`
`157`	`157`	`let request = request.body(body)?;`
`158`	`158`
`159`		`- Ok(self`
`160`		`- .service_client`
	`159`	`+ self.service_client`
`161`	`160`	`.http_client()`
`162`	`161`	`.execute_request_check_status(request, StatusCode::OK)`
`163`	`162`	`.await?`
`164`		`- .try_into()?)`
	`163`	`+ .try_into()`
`165`	`164`	`}`
`166`	`165`	`}`
`167`	`166`
Original file line number	Diff line number	Diff line change
`@@ -169,7 +169,7 @@ impl<'a, T: TokenCredential> CertificateClient<'a, T> {`
`169`	`169`	`/// Runtime::new().unwrap().block_on(example());`
`170`	`170`	/// ```
`171`	`171`	`pub async fn get_certificate(&mut self, name: &'a str) -> Result<KeyVaultCertificate, Error> {`
`172`		`- Ok(self.get_certificate_with_version(name, "").await?)`
	`172`	`+ self.get_certificate_with_version(name, "").await`
`173`	`173`	`}`
`174`	`174`
`175`	`175`	`/// Gets a certificate from the Key Vault with a specific version.`
Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ impl<'a, T: TokenCredential> KeyClient<'a, T> {`
`116`	`116`	`/// Runtime::new().unwrap().block_on(example());`
`117`	`117`	/// ```
`118`	`118`	`pub async fn get_secret(&mut self, secret_name: &str) -> Result<KeyVaultSecret, Error> {`
`119`		`- Ok(self.get_secret_with_version(secret_name, "").await?)`
	`119`	`+ self.get_secret_with_version(secret_name, "").await`
`120`	`120`	`}`
`121`	`121`
`122`	`122`	`/// Gets a secret from the Key Vault with a specific version.`