From 37d30b5f42560bdda651792dc1842e5586b8168a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Niemier?= <~@hauleth.dev> Date: Mon, 18 May 2026 13:02:30 +0200 Subject: [PATCH] fix: properly return errors when fetching keys --- cli/src/config.rs | 8 ++++++-- cli/src/lib.rs | 6 ++++-- cli/src/main.rs | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/cli/src/config.rs b/cli/src/config.rs index af50564..dafe1da 100644 --- a/cli/src/config.rs +++ b/cli/src/config.rs @@ -18,8 +18,12 @@ impl Entry { pub fn fetch(self) -> Result<(String, Vec)> { let mut stream: Vec = self .keys - .par_iter() - .flat_map(|k| k.fetch().unwrap()) + .iter() + .par_bridge() + .map(|k| k.fetch()) + .collect::>>()? + .into_iter() + .flatten() .collect(); // Deduplicate keys, no need for duplicated entries diff --git a/cli/src/lib.rs b/cli/src/lib.rs index ca1f861..3b8ca7f 100644 --- a/cli/src/lib.rs +++ b/cli/src/lib.rs @@ -2,10 +2,12 @@ // // SPDX-License-Identifier: EUPL-1.2 +use simple_eyre::eyre::Result; + pub mod config; pub mod output; pub mod sources; -pub fn fuk(config: config::Config) -> output::Output { - config.fetch().unwrap() +pub fn fuk(config: config::Config) -> Result { + config.fetch() } diff --git a/cli/src/main.rs b/cli/src/main.rs index 5da8674..ed3a3c7 100644 --- a/cli/src/main.rs +++ b/cli/src/main.rs @@ -54,7 +54,7 @@ fn main() -> Result<()> { let config: fuk::config::Config = toml::from_str(&args.file.read_all()?)?; - let output = fuk::fuk(config); + let output = fuk::fuk(config)?; let out = std::io::stdout(); let mut out = out.lock(); -- 2.51.2