fix: Fixed detection warnings in rust v1.93.0 (#1591)

This commit is contained in:
houseme
2026-01-23 13:09:41 +08:00
committed by GitHub
parent fd08be7be2
commit e5284a85ed
4 changed files with 19 additions and 58 deletions
+8 -14
View File
@@ -617,11 +617,7 @@ impl FileMeta {
// delete_version deletes version, returns data_dir
#[tracing::instrument(skip(self))]
pub fn delete_version(&mut self, fi: &FileInfo) -> Result<Option<Uuid>> {
let vid = if fi.version_id.is_none() {
Some(Uuid::nil())
} else {
Some(fi.version_id.unwrap())
};
let vid = fi.version_id.or(Some(Uuid::nil()));
let mut ventry = FileMetaVersion::default();
if fi.deleted {
@@ -1729,15 +1725,13 @@ impl From<FileMetaVersion> for FileMetaVersionHeader {
f
};
let (ec_n, ec_m) = {
if value.version_type == VersionType::Object && value.object.is_some() {
(
value.object.as_ref().unwrap().erasure_n as u8,
value.object.as_ref().unwrap().erasure_m as u8,
)
} else {
(0, 0)
}
let (ec_n, ec_m) = if value.version_type == VersionType::Object {
value
.object
.as_ref()
.map_or((0, 0), |o| (o.erasure_n as u8, o.erasure_m as u8))
} else {
(0, 0)
};
Self {