From 9faa6c991ffa6d3bd3e881e2f8949cb42d1eec98 Mon Sep 17 00:00:00 2001 From: David Carlier Date: Mon, 27 Jan 2025 15:31:55 +0000 Subject: [PATCH] virtme_ng_init: replace Err(...) instances for is_err() is_err() is more idiomatic when the error case is not handled. Signed-off-by: David Carlier --- virtme_ng_init/src/main.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/virtme_ng_init/src/main.rs b/virtme_ng_init/src/main.rs index 515f4ae..d2e84af 100644 --- a/virtme_ng_init/src/main.rs +++ b/virtme_ng_init/src/main.rs @@ -464,7 +464,7 @@ fn mount_virtme_overlays() { utils::do_mkdir(upperdir); utils::do_mkdir(workdir); let result = utils::do_mount_check(&key, &path, "overlay", 0, mnt_opts); - if let Err(_) = result { + if result.is_err() { // Old kernels don't support xino=on|off, re-try without this option. let mnt_opts = &format!( "lowerdir={},upperdir={},workdir={}", @@ -800,7 +800,7 @@ fn setup_user_script(uid: u32) { fn setup_root_home() { // Set up a basic environment (unless virtme-ng is running as root on the host) - if let Err(_) = env::var("virtme_root_user") { + if env::var("virtme_root_user").is_err() { utils::do_mkdir("/run/tmp/roothome"); utils::do_mount("/run/tmp/roothome", "/root", "", libc::MS_BIND as usize, ""); env::set_var("HOME", "/run/tmp/roothome");