From 525f8766b4eba055102d7bfb2e604b511bcfb46b Mon Sep 17 00:00:00 2001 From: Emily Toop Date: Fri, 26 May 2017 14:44:53 +0100 Subject: [PATCH] Address review comments =nalexander. * Bump rust version number. * Use `bail` when throwing errors. * Improve edn parser. * Remove references to unused `more` flag. * Improve naming of query and transact commands. --- tools/cli/src/mentat_cli/command_parser.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/cli/src/mentat_cli/command_parser.rs b/tools/cli/src/mentat_cli/command_parser.rs index 58a1d4bf..3b925977 100644 --- a/tools/cli/src/mentat_cli/command_parser.rs +++ b/tools/cli/src/mentat_cli/command_parser.rs @@ -115,13 +115,13 @@ pub fn command(s: &str) -> Result { let query_parser = try(string(LONG_QUERY_COMMAND)).or(try(string(SHORT_QUERY_COMMAND))) .with(edn_arg_parser()) .map(|x| { - Ok(Command::Query(x)) + Ok(Command::Query(x.into_iter().collect())) }); let transact_parser = try(string(LONG_TRANSACT_COMMAND)).or(try(string(SHORT_TRANSACT_COMMAND))) .with(edn_arg_parser()) .map( |x| { - Ok(Command::Transact(x)) + Ok(Command::Transact(x.into_iter().collect())) }); spaces()