From 2ad869aceb67710c698e0990cf4e48bed3a9bedf Mon Sep 17 00:00:00 2001 From: Sergey Kasmy Date: Thu, 18 May 2023 00:24:07 +0200 Subject: [PATCH] Replace remaining unwraps with better explained .expect()s --- fetcher/src/main.rs | 3 ++- fetcher/src/settings/data/runtime_external_save.rs | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/fetcher/src/main.rs b/fetcher/src/main.rs index 0a15910..622910b 100644 --- a/fetcher/src/main.rs +++ b/fetcher/src/main.rs @@ -119,7 +119,8 @@ fn set_up_logging() -> Result<()> { .with(journald.with_filter(LevelFilter::INFO)) .with(stdout.with_filter(env_filter)); - tracing::subscriber::set_global_default(subscriber).unwrap(); + tracing::subscriber::set_global_default(subscriber) + .expect("tracing shouldn't already have been set up"); color_eyre::install()?; Ok(()) diff --git a/fetcher/src/settings/data/runtime_external_save.rs b/fetcher/src/settings/data/runtime_external_save.rs index 5eb3173..1f8b7b8 100644 --- a/fetcher/src/settings/data/runtime_external_save.rs +++ b/fetcher/src/settings/data/runtime_external_save.rs @@ -51,7 +51,8 @@ impl ExternalSave for TruncatingFileWriter { if let Some(rf_conf) = fetcher_config::jobs::read_filter::ReadFilter::unparse(read_filter).await { - let s = serde_json::to_string(&rf_conf).unwrap(); + let s = serde_json::to_string(&rf_conf) + .expect("A ReadFilter should always be serializable"); self.write(s.as_bytes()) .await @@ -70,7 +71,8 @@ impl ExternalSave for TruncatingFileWriter { ) -> Result<(), ExternalSaveError> { let map_conf = fetcher_config::jobs::task::entry_to_msg_map::EntryToMsgMap::unparse(map.clone()); - let s = serde_json::to_string(&map_conf).unwrap(); + let s = serde_json::to_string(&map_conf) + .expect("An EntryToMsgMap should always be serializable"); self.write(s.as_bytes()) .await