mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Apply suggestions from code review

Browse Source 
Co-authored-by: Joshua Nelson <joshua@yottadb.com>
This commit is contained in:
Nixon Enraght-Moony 2021-02-21 19:45:32 +00:00 committed by GitHub
parent dd4b938c7f
commit a22d948eb0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/tools/jsondocck/src/main.rs
View File

@ -187,7 +187,7 @@ fn get_commands(template: &str) -> Result<Vec<Command>, ()> {
/// Performs the actual work of ensuring a command passes. Generally assumes the command /// Performs the actual work of ensuring a command passes. Generally assumes the command
/// is syntactically valid. /// is syntactically valid.
fn check_command(command: Command, cache: &mut Cache) -> Result<(), CkError> { fn check_command(command: Command, cache: &mut Cache) -> Result<(), CkError> {
// FIXME: Be more granular about why, (eg syntax error, count not equal) // FIXME: Be more granular about why, (e.g. syntax error, count not equal)
let result = match command.kind { let result = match command.kind {
CommandKind::Has => { CommandKind::Has => {
match command.args.len() { match command.args.len() {
@ -215,7 +215,7 @@ fn check_command(command: Command, cache: &mut Cache) -> Result<(), CkError> {
v_holder = serde_json::from_str(&command.args[2]).unwrap(); v_holder = serde_json::from_str(&command.args[2]).unwrap();
&v_holder &v_holder
}; };
!results.is_empty() && results.into_iter().any(|val| val == pat) results.contains(pat)
} }
Err(_) => false, Err(_) => false,
} }
@ -263,7 +263,7 @@ fn check_command(command: Command, cache: &mut Cache) -> Result<(), CkError> {
Ok(results) => { Ok(results) => {
assert_eq!(results.len(), 1); assert_eq!(results.len(), 1);
let r = cache.variables.insert(command.args[0].clone(), results[0].clone()); let r = cache.variables.insert(command.args[0].clone(), results[0].clone());
assert!(r.is_none(), "Name collision"); assert!(r.is_none(), "Name collision: {} is duplicated", command.args[0]);
true true
} }
Err(_) => false, Err(_) => false,