chore: upgrade dependencies and migrate to aws-lc-rs (#1333)

crates/ecstore/src/store.rs

@@ -243,10 +243,10 @@ impl ECStore {
         });
 
         // Only set it when the global deployment ID is not yet configured
-        if let Some(dep_id) = deployment_id {
-            if get_global_deployment_id().is_none() {
-                set_global_deployment_id(dep_id);
-            }
+        if let Some(dep_id) = deployment_id
+            && get_global_deployment_id().is_none()
+        {
+            set_global_deployment_id(dep_id);
         }
 
         let wait_sec = 5;
@@ -768,10 +768,10 @@ impl ECStore {
             def_pool = pinfo.clone();
             has_def_pool = true;
             // https://docs.aws.amazon.com/AmazonS3/latest/userguide/conditional-deletes.html
-            if is_err_object_not_found(err) {
-                if let Err(err) = opts.precondition_check(&pinfo.object_info) {
-                    return Err(err.clone());
-                }
+            if is_err_object_not_found(err)
+                && let Err(err) = opts.precondition_check(&pinfo.object_info)
+            {
+                return Err(err.clone());
             }
 
             if !is_err_object_not_found(err) && !is_err_version_not_found(err) {
@@ -885,13 +885,14 @@ impl ECStore {
                 return Ok((obj, res.idx));
             }
 
-            if let Some(err) = res.err {
-                if !is_err_object_not_found(&err) && !is_err_version_not_found(&err) {
-                    return Err(err);
-                }
-
-                // TODO: delete marker
+            if let Some(err) = res.err
+                && !is_err_object_not_found(&err)
+                && !is_err_version_not_found(&err)
+            {
+                return Err(err);
             }
+
+            // TODO: delete marker
         }
 
         let object = decode_dir_object(object);
@@ -918,12 +919,12 @@ impl ECStore {
         let mut derrs = Vec::new();
 
         for pe in errs.iter() {
-            if let Some(err) = &pe.err {
-                if err == &StorageError::ErasureWriteQuorum {
-                    objs.push(None);
-                    derrs.push(Some(StorageError::ErasureWriteQuorum));
-                    continue;
-                }
+            if let Some(err) = &pe.err
+                && err == &StorageError::ErasureWriteQuorum
+            {
+                objs.push(None);
+                derrs.push(Some(StorageError::ErasureWriteQuorum));
+                continue;
             }
 
             if let Some(idx) = pe.index {
@@ -1226,14 +1227,14 @@ impl StorageAPI for ECStore {
 
     #[instrument(skip(self))]
     async fn make_bucket(&self, bucket: &str, opts: &MakeBucketOptions) -> Result<()> {
-        if !is_meta_bucketname(bucket) {
-            if let Err(err) = check_valid_bucket_name_strict(bucket) {
-                return Err(StorageError::BucketNameInvalid(err.to_string()));
-            }
-
-            // TODO: nslock
+        if !is_meta_bucketname(bucket)
+            && let Err(err) = check_valid_bucket_name_strict(bucket)
+        {
+            return Err(StorageError::BucketNameInvalid(err.to_string()));
         }
 
+        // TODO: nslock
+
         if let Err(err) = self.peer_sys.make_bucket(bucket, opts).await {
             let err = to_object_err(err.into(), vec![bucket]);
             if !is_err_bucket_exists(&err) {
@@ -1427,12 +1428,12 @@ impl StorageAPI for ECStore {
         let pool_idx = self.get_pool_idx_no_lock(src_bucket, &src_object, src_info.size).await?;
 
         if cp_src_dst_same {
-            if let (Some(src_vid), Some(dst_vid)) = (&src_opts.version_id, &dst_opts.version_id) {
-                if src_vid == dst_vid {
-                    return self.pools[pool_idx]
-                        .copy_object(src_bucket, &src_object, dst_bucket, &dst_object, src_info, src_opts, dst_opts)
-                        .await;
-                }
+            if let (Some(src_vid), Some(dst_vid)) = (&src_opts.version_id, &dst_opts.version_id)
+                && src_vid == dst_vid
+            {
+                return self.pools[pool_idx]
+                    .copy_object(src_bucket, &src_object, dst_bucket, &dst_object, src_info, src_opts, dst_opts)
+                    .await;
             }
 
             if !dst_opts.versioned && src_opts.version_id.is_none() {
@@ -2433,13 +2434,13 @@ fn check_list_multipart_args(
     check_list_objs_args(bucket, prefix, key_marker)?;
 
     if let Some(upload_id_marker) = upload_id_marker {
-        if let Some(key_marker) = key_marker {
-            if key_marker.ends_with('/') {
-                return Err(StorageError::InvalidUploadIDKeyCombination(
-                    upload_id_marker.to_string(),
-                    key_marker.to_string(),
-                ));
-            }
+        if let Some(key_marker) = key_marker
+            && key_marker.ends_with('/')
+        {
+            return Err(StorageError::InvalidUploadIDKeyCombination(
+                upload_id_marker.to_string(),
+                key_marker.to_string(),
+            ));
         }
 
         if let Err(_e) = base64_simd::URL_SAFE_NO_PAD.decode_to_vec(upload_id_marker.as_bytes()) {
@@ -2510,10 +2511,10 @@ pub async fn get_disk_infos(disks: &[Option<DiskStore>]) -> Vec<Option<DiskInfo>
     let opts = &DiskInfoOptions::default();
     let mut res = vec![None; disks.len()];
     for (idx, disk_op) in disks.iter().enumerate() {
-        if let Some(disk) = disk_op {
-            if let Ok(info) = disk.disk_info(opts).await {
-                res[idx] = Some(info);
-            }
+        if let Some(disk) = disk_op
+            && let Ok(info) = disk.disk_info(opts).await
+        {
+            res[idx] = Some(info);
         }
     }