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.
This commit is contained in:
parent
00af587682
commit
525f8766b4
1 changed files with 2 additions and 2 deletions
|
@ -115,13 +115,13 @@ pub fn command(s: &str) -> Result<Command, cli::Error> {
|
||||||
let query_parser = try(string(LONG_QUERY_COMMAND)).or(try(string(SHORT_QUERY_COMMAND)))
|
let query_parser = try(string(LONG_QUERY_COMMAND)).or(try(string(SHORT_QUERY_COMMAND)))
|
||||||
.with(edn_arg_parser())
|
.with(edn_arg_parser())
|
||||||
.map(|x| {
|
.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)))
|
let transact_parser = try(string(LONG_TRANSACT_COMMAND)).or(try(string(SHORT_TRANSACT_COMMAND)))
|
||||||
.with(edn_arg_parser())
|
.with(edn_arg_parser())
|
||||||
.map( |x| {
|
.map( |x| {
|
||||||
Ok(Command::Transact(x))
|
Ok(Command::Transact(x.into_iter().collect()))
|
||||||
});
|
});
|
||||||
|
|
||||||
spaces()
|
spaces()
|
||||||
|
|
Loading…
Reference in a new issue