Fix lint

apache · Aug 7, 2022 · 41872b2 · 41872b2
1 parent f80a60c
commit 41872b2
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 30 deletions.
diff --git a/object_store/src/aws/client.rs b/object_store/src/aws/client.rs
@@ -164,7 +164,7 @@ impl TryFrom<ListContents> for ObjectMeta {
     type Error = crate::Error;
 
     fn try_from(value: ListContents) -> Result<Self> {
-        Ok(ObjectMeta {
+        Ok(Self {
             location: Path::parse(value.key)?,
             last_modified: value.last_modified,
             size: value.size,
@@ -230,7 +230,10 @@ impl S3Client {
     }
 
     async fn get_credential(&self) -> Result<Arc<AwsCredential>> {
-        self.config.credentials.get_credential(&self.client, &self.config.retry_config).await
+        self.config
+            .credentials
+            .get_credential(&self.client, &self.config.retry_config)
+            .await
     }
 
     /// Make an S3 GET request <https://docs.aws.amazon.com/AmazonS3/latest/API/API_GetObject.html>
@@ -271,7 +274,7 @@ impl S3Client {
     }
 
     /// Make an S3 PUT request <https://docs.aws.amazon.com/AmazonS3/latest/API/API_PutObject.html>
-    pub async fn put_request<T: Serialize + ?Sized>(
+    pub async fn put_request<T: Serialize + ?Sized + Sync>(
         &self,
         path: &Path,
         bytes: Option<Bytes>,
@@ -302,7 +305,7 @@ impl S3Client {
     }
 
     /// Make an S3 Delete request <https://docs.aws.amazon.com/AmazonS3/latest/API/API_DeleteObject.html>
-    pub async fn delete_request<T: Serialize>(
+    pub async fn delete_request<T: Serialize + ?Sized + Sync>(
         &self,
         path: &Path,
         query: &T,
@@ -374,7 +377,7 @@ impl S3Client {
         query.push(("list-type", "2"));
 
         if let Some(prefix) = prefix {
-            query.push(("prefix", prefix.as_ref()))
+            query.push(("prefix", prefix))
         }
 
         let response = self

diff --git a/object_store/src/aws/credential.rs b/object_store/src/aws/credential.rs
@@ -68,13 +68,12 @@ struct RequestSigner<'a> {
     region: &'a str,
 }
 
-const DATE_HEADER: &'static str = "x-amz-date";
-const HASH_HEADER: &'static str = "x-amz-content-sha256";
-const TOKEN_HEADER: &'static str = "x-amz-security-token";
-const AUTH_HEADER: &'static str = "authorization";
+const DATE_HEADER: &str = "x-amz-date";
+const HASH_HEADER: &str = "x-amz-content-sha256";
+const TOKEN_HEADER: &str = "x-amz-security-token";
+const AUTH_HEADER: &str = "authorization";
 
-const ALL_HEADERS: &[&'static str; 4] =
-    &[DATE_HEADER, HASH_HEADER, TOKEN_HEADER, AUTH_HEADER];
+const ALL_HEADERS: &[&str; 4] = &[DATE_HEADER, HASH_HEADER, TOKEN_HEADER, AUTH_HEADER];
 
 impl<'a> RequestSigner<'a> {
     fn sign(&self, request: &mut Request) {
@@ -269,7 +268,7 @@ impl CredentialProvider {
         retry_config: &RetryConfig,
     ) -> Result<Arc<AwsCredential>> {
         match self {
-            CredentialProvider::Static { credential } => Ok(Arc::clone(&credential)),
+            CredentialProvider::Static { credential } => Ok(Arc::clone(credential)),
             CredentialProvider::Instance { cache } => {
                 cache
                     .get_or_insert_with(|| {

diff --git a/object_store/src/aws/mod.rs b/object_store/src/aws/mod.rs
@@ -195,7 +195,7 @@ impl ObjectStore for AmazonS3 {
             .context(MissingContentLengthSnafu)?;
 
         let last_modified = last_modified.to_str().context(BadHeaderSnafu)?;
-        let last_modified = DateTime::parse_from_rfc2822(last_modified.as_ref())
+        let last_modified = DateTime::parse_from_rfc2822(last_modified)
             .context(InvalidLastModifiedSnafu { last_modified })?
             .with_timezone(&Utc);
 
@@ -325,7 +325,7 @@ impl CloudMultiPartUploadImpl for S3MultiPartUpload {
 ///  .with_secret_access_key(SECRET_KEY)
 ///  .build();
 /// ```
-#[derive(Debug)]
+#[derive(Debug, Default)]
 pub struct AmazonS3Builder {
     access_key_id: Option<String>,
     secret_access_key: Option<String>,
@@ -337,21 +337,6 @@ pub struct AmazonS3Builder {
     allow_http: bool,
 }
 
-impl Default for AmazonS3Builder {
-    fn default() -> Self {
-        Self {
-            access_key_id: None,
-            secret_access_key: None,
-            region: None,
-            bucket_name: None,
-            endpoint: None,
-            token: None,
-            retry_config: Default::default(),
-            allow_http: false,
-        }
-    }
-}
-
 impl AmazonS3Builder {
     /// Create a new [`AmazonS3Builder`] with default values.
     pub fn new() -> Self {

diff --git a/object_store/src/client/pagination.rs b/object_store/src/client/pagination.rs
@@ -46,7 +46,7 @@ where
         };
 
         let next_state = match continuation {
-            Some(token) => ListState::HasMore(s, token.clone()),
+            Some(token) => ListState::HasMore(s, token),
             None => ListState::Done,
         };