From ad43f69152d51ae2afc6ff2091b6c88db4377383 Mon Sep 17 00:00:00 2001 From: Jack Wills <32690432+mrjackwills@users.noreply.github.com> Date: Mon, 30 May 2022 00:27:11 +0000 Subject: [PATCH] fix: docker_data remove unwrap() change update_all_containers unwrap with unwrap_or, and use a filter_map on output vec --- src/docker_data/mod.rs | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/docker_data/mod.rs b/src/docker_data/mod.rs index 1bd9383..1f0dd8b 100644 --- a/src/docker_data/mod.rs +++ b/src/docker_data/mod.rs @@ -145,11 +145,13 @@ impl DockerData { self.app_data.lock().update_containers(&output); output .iter() - .map(|i| { - ( - i.state.as_ref().unwrap() == "running", - i.id.as_ref().unwrap().to_owned(), - ) + .filter_map(|i| { + i.id.as_ref().map(|id| ( + i.state.as_ref().unwrap_or(&String::new()) == "running", + id.to_owned(), + )) + + }) .collect::>() }