From 69f11ab211d7d5756c3834445d666c697dc69ed7 Mon Sep 17 00:00:00 2001 From: Gabriele Musco Date: Tue, 27 Jun 2023 06:55:44 +0200 Subject: [PATCH] fix: replace logic based on unstable Option::is_some_and --- src/profile.rs | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/src/profile.rs b/src/profile.rs index cafd1d1..292fe16 100644 --- a/src/profile.rs +++ b/src/profile.rs @@ -157,9 +157,23 @@ impl Profile { && !self.xrservice_path.is_empty() && !self.prefix.is_empty() && (!self.libsurvive_enabled - || self.libsurvive_path.as_ref().is_some_and(|p| !p.is_empty())) - && (!self.basalt_enabled || self.basalt_path.as_ref().is_some_and(|p| !p.is_empty())) - && (!self.mercury_enabled || self.mercury_path.as_ref().is_some_and(|p| !p.is_empty())) + || !self + .libsurvive_path + .as_ref() + .unwrap_or(&"".to_string()) + .is_empty()) + && (!self.basalt_enabled + || !self + .basalt_path + .as_ref() + .unwrap_or(&"".to_string()) + .is_empty()) + && (!self.mercury_enabled + || !self + .mercury_path + .as_ref() + .unwrap_or(&"".to_string()) + .is_empty()) } }