Skip to content

Commit 0ff281e

Browse files
committed
Fix clippy warning. Use if let instead of unwrap.
Signed-off-by: Alessandro Passaro <[email protected]>
1 parent 21b9a05 commit 0ff281e

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

mountpoint-s3-fs/src/fs/sse.rs

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,15 +80,19 @@ impl ServerSideEncryption {
8080
sse_kms_key_id: Option<&str>,
8181
) -> Result<(), SseCorruptedError> {
8282
self.validate()?; // validate in-memory values, as we are using them to decide whether to skip the response check or not
83-
if self.sse_type.is_some() && self.sse_type.as_deref() != sse_type {
83+
if let Some(stored_sse_type) = self.sse_type.as_deref()
84+
&& Some(stored_sse_type) != sse_type
85+
{
8486
return Err(SseCorruptedError::TypeMismatch(
85-
self.sse_type.as_ref().unwrap().clone(),
87+
stored_sse_type.to_string(),
8688
sse_type.map(str::to_string),
8789
));
8890
}
89-
if self.sse_kms_key_id.is_some() && self.sse_kms_key_id.as_deref() != sse_kms_key_id {
91+
if let Some(stored_sse_kms_key_id) = self.sse_kms_key_id.as_deref()
92+
&& Some(stored_sse_kms_key_id) != sse_kms_key_id
93+
{
9094
return Err(SseCorruptedError::KeyMismatch(
91-
self.sse_kms_key_id.as_ref().unwrap().clone(),
95+
stored_sse_kms_key_id.to_string(),
9296
sse_kms_key_id.map(str::to_string),
9397
));
9498
}

0 commit comments

Comments
 (0)