github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2026-05-04 12:31:27 +00:00
Code Issues Projects Releases Wiki Activity

runtime-rs: Fix clippy warnings for Rust 1.93

Browse Source 
- Replace is_ok() check followed by unwrap_err() with if let Err pattern
- Replace .err().expect() with .expect_err()
- Replace is_some() check followed by unwrap() with if let Some pattern

These changes address clippy::unnecessary_unwrap and clippy::err_expect
warnings in Rust 1.93.

Assisted-by: IBM Bob
Signed-off-by: stevenhorsman <steven@uk.ibm.com>
This commit is contained in:
stevenhorsman
2026-04-17 15:05:10 +01:00
parent 56d44062ea
commit 1dbfd4b7f4
3 changed files with 15 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/runtime-rs/crates/hypervisor/src/ch/inner_hypervisor.rs
View File

@@ -372,12 +372,8 @@ impl CloudHypervisorInner {
}
let netns = self.netns.clone();
if self.netns.is_some() {
info!(
sl!(),
"set netns for vmm : {:?}",
self.netns.as_ref().unwrap()
);
if let Some(netns_ref) = &self.netns {
info!(sl!(), "set netns for vmm : {:?}", netns_ref);
}
let user: Option<RootlessUser> = if is_rootless() {

22
src/runtime-rs/crates/hypervisor/src/kernel_param.rs
View File

@@ -495,13 +495,13 @@ mod tests {
t.use_dax,
);
let msg = format!("{msg}, result: {result:?}");
if t.result.is_ok() {
assert!(result.is_ok(), "{}", msg);
assert_eq!(t.expect_params, result.unwrap());
} else {
let expected_error = format!("{}", t.result.as_ref().unwrap_err());
if let Err(expected_err) = &t.result {
let expected_error = format!("{expected_err}");
let actual_error = format!("{}", result.unwrap_err());
assert!(actual_error == expected_error, "{}", msg);
} else {
assert!(result.is_ok(), "{}", msg);
assert_eq!(t.expect_params, result.unwrap());
}
}
}
@@ -525,8 +525,7 @@ mod tests {
VM_ROOTFS_FILESYSTEM_EXT4,
false,
)
.err()
.expect("expected missing salt error");
.expect_err("expected missing salt error");
assert!(format!("{err}").contains("Missing kernel_verity_params salt"));
let err = KernelParams::new_rootfs_kernel_params(
@@ -535,8 +534,7 @@ mod tests {
VM_ROOTFS_FILESYSTEM_EXT4,
false,
)
.err()
.expect("expected missing data_blocks error");
.expect_err("expected missing data_blocks error");
assert!(format!("{err}").contains("Missing kernel_verity_params data_blocks"));
let err = KernelParams::new_rootfs_kernel_params(
@@ -545,8 +543,7 @@ mod tests {
VM_ROOTFS_FILESYSTEM_EXT4,
false,
)
.err()
.expect("expected invalid data_blocks error");
.expect_err("expected invalid data_blocks error");
assert!(format!("{err}").contains("Invalid kernel_verity_params data_blocks"));
let err = KernelParams::new_rootfs_kernel_params(
@@ -555,8 +552,7 @@ mod tests {
VM_ROOTFS_FILESYSTEM_EXT4,
false,
)
.err()
.expect("expected invalid entry error");
.expect_err("expected invalid entry error");
assert!(format!("{err}").contains("Invalid kernel_verity_params entry"));
Ok(())

8
src/runtime-rs/crates/shim/src/args.rs
View File

@@ -270,12 +270,12 @@ mod tests {
let result = t.arg.clone().validate(should_check_bundle);
let msg = format!("{}, result: {:?}", msg, result);
if t.result.is_ok() {
assert!(result.is_ok(), "{}", msg);
} else {
let expected_error = format!("{}", t.result.as_ref().unwrap_err());
if let Err(expected_err) = &t.result {
let expected_error = format!("{expected_err}");
let actual_error = format!("{}", result.unwrap_err());
assert!(actual_error == expected_error, "{}", msg);
} else {
assert!(result.is_ok(), "{}", msg);
}
}
}