diff options
author | Dario Vladović <d.vladimyr@gmail.com> | 2021-03-27 18:53:54 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-03-27 18:53:54 +0100 |
commit | 1336944ab7cce6863d39ab1bd746e90d45a90ba9 (patch) | |
tree | 52064b8a453154370fe8be6562cb64dbc0674636 | |
parent | cf68f546113eba7e9f84775c302d6d2f880a09d5 (diff) |
refactor(singularity): use `?` operator (#2518)
-rw-r--r-- | src/modules/singularity.rs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/modules/singularity.rs b/src/modules/singularity.rs index a6ec73b83..30c3106d8 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<Module<'a>> { - 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<Module<'a>> { _ => None, }) .map(|variable| match variable { - "env" => singularity_env.as_ref().map(Ok), + "env" => Some(Ok(&singularity_env)), _ => None, }) .parse(None) |