From b785956bdbe07f24b80fe6f8e9fb4a1eccb619ad Mon Sep 17 00:00:00 2001 From: "Panagiotis \"Ivory\" Vasilopoulos" Date: Sat, 21 Feb 2026 15:49:21 +0100 Subject: [PATCH] lib: tests: refactor check_ruleset_support's logic This change introduces idiomaticity-related improvements when establishing the RulesetStatus, nothing much more. Signed-off-by: Panagiotis "Ivory" Vasilopoulos --- src/lib.rs | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index 175071f..aac4b6e 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -154,17 +154,10 @@ mod tests { // TODO: Check exact error type; this may require better error types. assert!(matches!(ret, Err(TestRulesetError::Ruleset(_)))); } else { - let full_support = if let Some(full_inner) = full { - abi >= full_inner - } else { - false - }; - let ruleset_status = if full_support { - RulesetStatus::FullyEnforced - } else if abi >= partial { - RulesetStatus::PartiallyEnforced - } else { - RulesetStatus::NotEnforced + let ruleset_status = match (full.map(|inner| abi >= inner), abi >= partial) { + (Some(true), _partial) => RulesetStatus::FullyEnforced, + (_full, false) => RulesetStatus::NotEnforced, + (_full, true) => RulesetStatus::PartiallyEnforced, }; let landlock_status = abi.into(); println!("Expecting ruleset status {ruleset_status:?}");