address upcoming clippy issues (#912)

Author: bmc-msft

sdk/core/src/error/http_error.rs

@@ -27,8 +27,8 @@ impl HttpError {
         error_code = error_code.or_else(|| get_error_code_from_body(&body));
         HttpError {
             status,
-            headers,
             error_code,
+            headers,
             body,
         }
     }

sdk/core/src/error/mod.rs

@@ -138,18 +138,19 @@ impl Error {
     /// Get the `ErrorKind` of this `Error`
     pub fn kind(&self) -> &ErrorKind {
         match &self.context {
-            Context::Simple(kind) => kind,
-            Context::Message { kind, .. } => kind,
-            Context::Custom(Custom { kind, .. }) => kind,
-            Context::Full(Custom { kind, .. }, _) => kind,
+            Context::Simple(kind)
+            | Context::Message { kind, .. }
+            | Context::Custom(Custom { kind, .. })
+            | Context::Full(Custom { kind, .. }, _) => kind,
         }
     }
 
     /// Consumes the Error, returning its inner error (if any).
     pub fn into_inner(self) -> std::result::Result<Box<dyn std::error::Error + Send + Sync>, Self> {
         match self.context {
-            Context::Custom(Custom { error, .. }) => Ok(error),
-            Context::Full(Custom { error, .. }, _) => Ok(error),
+            Context::Custom(Custom { error, .. }) | Context::Full(Custom { error, .. }, _) => {
+                Ok(error)
+            }
             _ => Err(self),
         }
     }
@@ -171,8 +172,9 @@ impl Error {
     /// Returns a reference to the inner error wrapped by this error (if any).
     pub fn get_ref(&self) -> Option<&(dyn std::error::Error + Send + Sync + 'static)> {
         match &self.context {
-            Context::Custom(Custom { error, .. }) => Some(error.as_ref()),
-            Context::Full(Custom { error, .. }, _) => Some(error.as_ref()),
+            Context::Custom(Custom { error, .. }) | Context::Full(Custom { error, .. }, _) => {
+                Some(error.as_ref())
+            }
             _ => None,
         }
     }
@@ -185,8 +187,9 @@ impl Error {
     /// Returns a mutable reference to the inner error wrapped by this error (if any).
     pub fn get_mut(&mut self) -> Option<&mut (dyn std::error::Error + Send + Sync + 'static)> {
         match &mut self.context {
-            Context::Custom(Custom { error, .. }) => Some(error.as_mut()),
-            Context::Full(Custom { error, .. }, _) => Some(error.as_mut()),
+            Context::Custom(Custom { error, .. }) | Context::Full(Custom { error, .. }, _) => {
+                Some(error.as_mut())
+            }
             _ => None,
         }
     }
@@ -200,8 +203,9 @@ impl Error {
 impl std::error::Error for Error {
     fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
         match &self.context {
-            Context::Custom(Custom { error, .. }) => error.source(),
-            Context::Full(Custom { error, .. }, _) => error.source(),
+            Context::Custom(Custom { error, .. }) | Context::Full(Custom { error, .. }, _) => {
+                error.source()
+            }
             _ => None,
         }
     }

sdk/core/src/http_client/reqwest.rs

@@ -32,7 +32,7 @@ impl HttpClient for ::reqwest::Client {
             .context(ErrorKind::Io, "failed to execute `reqwest` request")?;
 
         let status = rsp.status();
-        let headers = to_headers(rsp.headers())?;
+        let headers = to_headers(rsp.headers());
         let body: PinnedStream = Box::pin(rsp.bytes_stream().map_err(|error| {
             Error::full(
                 ErrorKind::Io,
@@ -49,7 +49,7 @@ impl HttpClient for ::reqwest::Client {
     }
 }
 
-fn to_headers(map: &::reqwest::header::HeaderMap) -> crate::Result<crate::headers::Headers> {
+fn to_headers(map: &::reqwest::header::HeaderMap) -> crate::headers::Headers {
     let map = map
         .iter()
         .filter_map(|(k, v)| {
@@ -66,7 +66,7 @@ fn to_headers(map: &::reqwest::header::HeaderMap) -> crate::Result<crate::header
             }
         })
         .collect::<HashMap<_, _>>();
-    Ok(crate::headers::Headers::from(map))
+    crate::headers::Headers::from(map)
 }
 
 fn try_from_method(method: &crate::Method) -> crate::Result<::reqwest::Method> {

sdk/core/src/pageable.rs

@@ -52,8 +52,7 @@ where
 
                 let next_state = response
                     .continuation()
-                    .map(State::Continuation)
-                    .unwrap_or(State::Done);
+                    .map_or(State::Done, State::Continuation);
 
                 Some((Ok(response), next_state))
             }

sdk/core/src/pipeline.rs

@@ -29,7 +29,7 @@ use std::sync::Arc;
 ///
 /// The `C` generic contains the pipeline-specific context. Different crates can pass
 /// different contexts using this generic. This way each crate can have its own specific pipeline
-/// context. For example, in CosmosDB, the generic carries the operation-specific information used by
+/// context. For example, in `CosmosDB`, the generic carries the operation-specific information used by
 /// the authorization policy.
 #[derive(Debug, Clone)]
 pub struct Pipeline {

sdk/core/src/policies/retry_policies/exponential_retry.rs

@@ -40,7 +40,7 @@ impl super::RetryPolicy for ExponentialRetryPolicy {
 
     fn sleep_duration(&self, retry_count: u32) -> Duration {
         let sleep_ms = self.delay.as_millis() as u64 * u64::pow(2u64, retry_count - 1)
-            + rand::random::<u8>() as u64;
+            + u64::from(rand::random::<u8>());
         Duration::from_millis(sleep_ms)
     }
 }

sdk/core/src/policies/retry_policies/fixed_retry.rs

@@ -38,7 +38,7 @@ impl super::RetryPolicy for FixedRetryPolicy {
     }
 
     fn sleep_duration(&self, _retry_count: u32) -> Duration {
-        let sleep_ms = self.delay.as_millis() as u64 + rand::random::<u8>() as u64;
+        let sleep_ms = self.delay.as_millis() as u64 + u64::from(rand::random::<u8>());
         Duration::from_millis(sleep_ms)
     }
 }

sdk/core/src/policies/retry_policies/retry_policy.rs

@@ -64,7 +64,7 @@ where
                     let error = Error::full(
                         ErrorKind::http_response(
                             status,
-                            http_error.error_code().map(|s| s.to_owned()),
+                            http_error.error_code().map(std::borrow::ToOwned::to_owned),
                         ),
                         http_error,
                         "server returned error status which will not be retried",

sdk/core/src/request.rs

@@ -63,7 +63,7 @@ impl Request {
         let mut result = self.url.path().to_owned();
         if let Some(query) = self.url.query() {
             result.push('?');
-            result.push_str(query)
+            result.push_str(query);
         }
         result
     }
@@ -74,7 +74,7 @@ impl Request {
 
     pub fn insert_headers<T: AsHeaders>(&mut self, headers: &T) {
         for (name, value) in headers.as_headers() {
-            self.insert_header(name, value)
+            self.insert_header(name, value);
         }
     }
 
@@ -95,7 +95,7 @@ impl Request {
         K: Into<crate::headers::HeaderName>,
         V: Into<crate::headers::HeaderValue>,
     {
-        self.headers.insert(key, value)
+        self.headers.insert(key, value);
     }
 
     pub fn add_optional_header_ref<T: crate::Header>(&mut self, item: &Option<&T>) {
@@ -106,11 +106,11 @@ impl Request {
 
     pub fn add_optional_header<T: crate::Header>(&mut self, item: &Option<T>) {
         if let Some(item) = item {
-            self.insert_header(item.name(), item.value())
+            self.insert_header(item.name(), item.value());
         }
     }
 
     pub fn add_mandatory_header<T: crate::Header>(&mut self, item: &T) {
-        self.insert_header(item.name(), item.value())
+        self.insert_header(item.name(), item.value());
     }
 }

sdk/core/src/request_options/accept.rs

@@ -34,6 +34,6 @@ impl Header for Accept {
     }
 
     fn value(&self) -> headers::HeaderValue {
-        self.0.to_owned().into()
+        self.0.clone().into()
     }
 }

sdk/core/src/request_options/accept_encoding.rs

@@ -35,6 +35,6 @@ impl Header for AcceptEncoding {
     }
 
     fn value(&self) -> headers::HeaderValue {
-        self.0.to_owned().into()
+        self.0.clone().into()
     }
 }

sdk/core/src/request_options/activity_id.rs

@@ -24,6 +24,6 @@ impl Header for ActivityId {
     }
 
     fn value(&self) -> headers::HeaderValue {
-        self.0.to_owned().into()
+        self.0.clone().into()
     }
 }

sdk/core/src/request_options/app.rs

@@ -25,6 +25,6 @@ impl Header for App {
     }
 
     fn value(&self) -> headers::HeaderValue {
-        self.0.to_owned().into()
+        self.0.clone().into()
     }
 }

sdk/core/src/request_options/client_request_id.rs

@@ -26,6 +26,6 @@ impl Header for ClientRequestId {
     }
 
     fn value(&self) -> headers::HeaderValue {
-        self.0.to_owned().into()
+        self.0.clone().into()
     }
 }

sdk/core/src/request_options/client_version.rs

@@ -26,6 +26,6 @@ impl Header for ClientVersion {
     }
 
     fn value(&self) -> headers::HeaderValue {
-        self.0.to_owned().into()
+        self.0.clone().into()
     }
 }

sdk/core/src/request_options/if_match_condition.rs

@@ -17,9 +17,7 @@ impl Header for IfMatchCondition {
 
     fn value(&self) -> headers::HeaderValue {
         match self.clone() {
-            IfMatchCondition::Match(etag) => etag,
-            IfMatchCondition::NotMatch(etag) => etag,
+            IfMatchCondition::Match(etag) | IfMatchCondition::NotMatch(etag) => etag.into(),
         }
-        .into()
     }
 }

sdk/core/src/request_options/if_modified_since_condition.rs

@@ -18,8 +18,8 @@ impl Header for IfModifiedSinceCondition {
 
     fn value(&self) -> headers::HeaderValue {
         match self {
-            IfModifiedSinceCondition::Modified(date) => date.to_rfc2822(),
-            IfModifiedSinceCondition::Unmodified(date) => date.to_rfc2822(),
+            IfModifiedSinceCondition::Modified(date)
+            | IfModifiedSinceCondition::Unmodified(date) => date.to_rfc2822(),
         }
         .into()
     }

sdk/core/src/request_options/if_source_match_condition.rs

@@ -16,9 +16,9 @@ impl Header for IfSourceMatchCondition {
 
     fn value(&self) -> headers::HeaderValue {
         match self.clone() {
-            IfSourceMatchCondition::Match(etag) => etag,
-            IfSourceMatchCondition::NotMatch(etag) => etag,
+            IfSourceMatchCondition::Match(etag) | IfSourceMatchCondition::NotMatch(etag) => {
+                etag.into()
+            }
         }
-        .into()
     }
 }

sdk/core/src/request_options/if_source_modified_since_condition.rs

@@ -17,9 +17,8 @@ impl Header for IfSourceModifiedSinceCondition {
 
     fn value(&self) -> headers::HeaderValue {
         match self {
-            IfSourceModifiedSinceCondition::Modified(date) => date.to_rfc2822(),
-            IfSourceModifiedSinceCondition::Unmodified(date) => date.to_rfc2822(),
+            IfSourceModifiedSinceCondition::Modified(date)
+            | IfSourceModifiedSinceCondition::Unmodified(date) => date.to_rfc2822().into(),
         }
-        .into()
     }
 }

sdk/core/src/request_options/sequence_number_condition.rs

@@ -18,10 +18,9 @@ impl Header for SequenceNumberCondition {
 
     fn value(&self) -> headers::HeaderValue {
         match self {
-            SequenceNumberCondition::Equal(val) => val.to_string(),
-            SequenceNumberCondition::LessOrEqual(val) => val.to_string(),
-            SequenceNumberCondition::Less(val) => val.to_string(),
+            SequenceNumberCondition::Equal(val)
+            | SequenceNumberCondition::LessOrEqual(val)
+            | SequenceNumberCondition::Less(val) => val.to_string().into(),
         }
-        .into()
     }
 }

sdk/core/src/request_options/user.rs

@@ -25,6 +25,6 @@ impl Header for User {
     }
 
     fn value(&self) -> headers::HeaderValue {
-        self.0.to_owned().into()
+        self.0.clone().into()
     }
 }

sdk/core/src/request_options/version.rs

@@ -24,6 +24,6 @@ impl Header for Version {
     }
 
     fn value(&self) -> headers::HeaderValue {
-        self.0.to_owned().into()
+        self.0.clone().into()
     }
 }