From 680112384d5b555a4e97228dfea1579d3ebc436d Mon Sep 17 00:00:00 2001 From: Oleksandr Kozachuk Date: Wed, 14 Dec 2022 16:35:20 +0100 Subject: [PATCH] Refactor a bit to allow different output destinations in future. --- src/repl.rs | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/repl.rs b/src/repl.rs index 42cf475..30e2690 100644 --- a/src/repl.rs +++ b/src/repl.rs @@ -166,14 +166,15 @@ impl<'a> LKEval<'a> { } }; let name = pwd.borrow().name.clone(); - if self.state.borrow().secrets.contains_key(&name) { - out.push(self.state.borrow().secrets.get(&name).unwrap().to_string()); - return; - } - match self.read_master(pwd.clone(), true) { - Some(sec) => out.push(pwd.borrow().encode(sec.as_str())), - None => out.push(format!("error: master for {} not found", pwd.borrow().name)), + let pass = if self.state.borrow().secrets.contains_key(&name) { + self.state.borrow().secrets.get(&name).unwrap().to_string() + } else { + match self.read_master(pwd.clone(), true) { + Some(sec) => pwd.borrow().encode(sec.as_str()), + None => { out.push(format!("error: master for {} not found", pwd.borrow().name)); return; } + } }; + out.push(pass); } fn cmd_ls(&self, out: &mut Vec, filter: String) {