fix: replace logic based on unstable Option::is_some_and

This commit is contained in:
Gabriele Musco 2023-06-27 06:55:44 +02:00
parent 18febae805
commit 69f11ab211
No known key found for this signature in database
GPG key ID: 1068D795C80E51DE

View file

@ -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())
}
}