From 1336944ab7cce6863d39ab1bd746e90d45a90ba9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dario=20Vladovi=C4=87?= Date: Sat, 27 Mar 2021 18:53:54 +0100 Subject: [PATCH] refactor(singularity): use `?` operator (#2518) --- src/modules/singularity.rs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/modules/singularity.rs b/src/modules/singularity.rs index a6ec73b8..30c3106d 100644 --- a/src/modules/singularity.rs +++ b/src/modules/singularity.rs @@ -7,8 +7,7 @@ use crate::formatter::StringFormatter; /// /// Will display the Singularity image if `$SINGULARITY_NAME` is set. pub fn module<'a>(context: &'a Context) -> Option> { - let singularity_env = context.get_env("SINGULARITY_NAME"); - singularity_env.as_ref()?; + let singularity_env = context.get_env("SINGULARITY_NAME")?; let mut module = context.new_module("singularity"); let config: SingularityConfig = SingularityConfig::try_load(module.config); @@ -24,7 +23,7 @@ pub fn module<'a>(context: &'a Context) -> Option> { _ => None, }) .map(|variable| match variable { - "env" => singularity_env.as_ref().map(Ok), + "env" => Some(Ok(&singularity_env)), _ => None, }) .parse(None)