From 6a4b51d340fd7c8caf136ac1640b8f30404b4d16 Mon Sep 17 00:00:00 2001 From: iff Date: Thu, 10 Apr 2025 01:09:17 +0200 Subject: [PATCH] revert: removed nix-index option wrapping --- core/src/system.rs | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/core/src/system.rs b/core/src/system.rs index 3d8fa42..8d0c28f 100644 --- a/core/src/system.rs +++ b/core/src/system.rs @@ -128,20 +128,18 @@ pub fn get_packages( if result.is_empty() { return None; } - let packages: Option> = result + let packages: Vec = result .lines() .map(|line| { - let package = line.split_whitespace().next()?; - Some(package.rsplit_once('.')?.0.to_string()) + line.split_whitespace() + .next() + .unwrap() + .rsplit_once('.') + .unwrap() + .0 + .to_string() }) .collect(); - let Some(packages) = packages else { - eprintln!( - "Unexpected output from nix-index:\n {}", - result.replace("\n", "\n ") - ); - return None; - }; if packages.is_empty() { None