fluencelabs/jsonpath
1
0
Fork 0
mirror of https://github.com/fluencelabs/jsonpath synced 2025-04-25 09:22:19 +00:00
Code Issues Projects Releases Wiki Activity

apply clippy lints - tests

Browse Source
This commit is contained in:
freestrings 2019-06-25 22:42:21 +09:00
parent 2f0d29d644
commit 319186b1d9
8 changed files with 45 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.travis.yml
View File

@ -14,16 +14,20 @@ branches:
matrix:
include:
- rust: stable
- rust: nightly
os: linux
env: RUST_BACKTRACE=1
before_cache: |
if [[ "$TRAVIS_RUST_VERSION" == stable ]]; then
cargo install cargo-tarpaulin -f
fi
before_script:
- rustup component add clippy
script:
- cargo clean
- cargo clippy -- -D warnings
- cargo build --verbose --all
- cargo clippy --all-targets --all-features -- -D warnings -A clippy::cognitive_complexity
- cargo test --verbose --all
after_success: |
cargo tarpaulin --exclude-files nodejs wasm parser/mod.rs --out Xml

3
build.sh
View File

@ -2,6 +2,9 @@
set -e
cargo clippy -- -D warnings && \
cargo clippy --all-targets --all-features -- -D warnings -A clippy::cognitive_complexity
# project_root
DIR="$(pwd)"
WASM="${DIR}"/wasm

66
src/parser/mod.rs
View File

@ -13,8 +13,8 @@ mod utils {
use std::str::FromStr;
pub fn string_to_num<F, S: FromStr>(string: &str, msg_handler: F) -> Result<S, String>
where
F: Fn() -> String,
where
F: Fn() -> String,
{
match string.parse() {
Ok(n) => Ok(n),
@ -195,13 +195,13 @@ impl Parser {
debug!("#boolean");
match tokenizer.next_token() {
Ok(Token::Key(_, ref v))
if {
let b = v.as_bytes();
!b.is_empty() && (b[0] == b't' || b[0] == b'T' || b[0] == b'f' || b[0] == b'F')
} =>
{
Ok(Self::node(ParseToken::Bool(v.eq_ignore_ascii_case("true"))))
}
if {
let b = v.as_bytes();
!b.is_empty() && (b[0] == b't' || b[0] == b'T' || b[0] == b'f' || b[0] == b'F')
} =>
{
Ok(Self::node(ParseToken::Bool(v.eq_ignore_ascii_case("true"))))
}
_ => Err(tokenizer.err_msg()),
}
}
@ -557,7 +557,7 @@ impl Parser {
};
return match key.as_bytes()[0] {
b'-' | b'0'...b'9' => Self::term_num(tokenizer),
b'-' | b'0'..=b'9' => Self::term_num(tokenizer),
_ => Self::boolean(tokenizer),
};
}
@ -687,7 +687,6 @@ pub trait NodeVisitor {
fn end_term(&mut self) {}
}
#[cfg(test)]
mod parser_tests {
use parser::{FilterToken, NodeVisitor, ParseToken, Parser};
@ -732,11 +731,7 @@ mod parser_tests {
setup();
fn invalid(path: &str) {
if let Err(_) = run(path) {
assert!(true);
} else {
assert!(false);
}
assert!(run(path).is_err());
}
invalid("$[]");
@ -821,24 +816,21 @@ mod parser_tests {
])
);
match run("$.") {
Ok(_) => panic!(),
_ => {}
if run("$.").is_ok() {
panic!();
}
match run("$..") {
Ok(_) => panic!(),
_ => {}
if run("$..").is_ok() {
panic!();
}
match run("$. a") {
Ok(_) => panic!(),
_ => {}
if run("$. a").is_ok() {
panic!();
}
}
#[test]
fn parse_array_sytax() {
fn parse_array_syntax() {
setup();
assert_eq!(
@ -1211,24 +1203,20 @@ mod parser_tests {
])
);
match run("$[1.1]") {
Ok(_) => panic!(),
_ => {}
if run("$[1.1]").is_ok() {
panic!();
}
match run("$[?(1.1<.2)]") {
Ok(_) => panic!(),
_ => {}
if run("$[?(1.1<.2)]").is_ok() {
panic!();
}
match run("$[?(1.1<2.)]") {
Ok(_) => panic!(),
_ => {}
if run("$[?(1.1<2.)]").is_ok() {
panic!();
}
match run("$[?(1.1<2.a)]") {
Ok(_) => panic!(),
_ => {}
if run("$[?(1.1<2.a)]").is_ok() {
panic!();
}
}
}
@ -1253,7 +1241,7 @@ mod tokenizer_tests {
}
fn run(input: &str, expected: (Vec<Token>, Option<TokenError>)) {
let (vec, err) = collect_token(input.clone());
let (vec, err) = collect_token(input);
assert_eq!((vec, err), expected, "\"{}\"", input);
}

2
src/parser/tokenizer.rs
View File

@ -161,7 +161,7 @@ impl<'a> Tokenizer<'a> {
if let Some('\\') = val.chars().last() {
self.input.next_char().map_err(to_token_error)?;
let _ = val.pop();
let (_, mut val_remain) = self
let (_, val_remain) = self
.input
.take_while(|c| *c != ch)
.map_err(to_token_error)?;

4
tests/common.rs
View File

@ -30,7 +30,7 @@ pub fn read_contents(path: &str) -> String {
}
#[allow(dead_code)]
pub fn select_and_then_compare<'a>(path: &str, json: Value, target: Value) {
pub fn select_and_then_compare(path: &str, json: Value, target: Value) {
let mut selector = Selector::default();
let result = selector
.str_path(path)
@ -50,7 +50,7 @@ pub fn select_and_then_compare<'a>(path: &str, json: Value, target: Value) {
}
#[allow(dead_code)]
pub fn compare_result<'a>(result: Vec<&Value>, target: Value) {
pub fn compare_result(result: Vec<&Value>, target: Value) {
let result = serde_json::to_value(result).unwrap();
assert_eq!(result, target);
}

8
tests/filter.rs
View File

@ -624,7 +624,7 @@ fn quote() {
fn all_filter() {
setup();
for path in vec![r#"$.*"#, r#"$[*]"#] {
for path in &[r#"$.*"#, r#"$[*]"#] {
select_and_then_compare(
path,
json!(["string", 42, { "key": "value" }, [0, 1]]),
@ -632,7 +632,7 @@ fn all_filter() {
);
}
for path in vec![r#"$..*"#, r#"$..[*]"#] {
for path in &[r#"$..*"#, r#"$..[*]"#] {
select_and_then_compare(
path,
json!(["string", 42, { "key": "value" }, [0, 1]]),
@ -640,7 +640,7 @@ fn all_filter() {
);
}
for path in vec![r#"$.*.*"#, r#"$[*].*"#, r#"$.*[*]"#, r#"$[*][*]"#] {
for path in &[r#"$.*.*"#, r#"$[*].*"#, r#"$.*[*]"#, r#"$[*][*]"#] {
select_and_then_compare(
path,
json!(["string", 42, { "key": "value" }, [0, 1]]),
@ -648,7 +648,7 @@ fn all_filter() {
);
}
for path in vec![r#"$..friends.*"#, r#"$[*].friends.*"#] {
for path in &[r#"$..friends.*"#, r#"$[*].friends.*"#] {
select_and_then_compare(
path,
read_json("./benches/data_array.json"),

6
tests/lib.rs
View File

@ -37,11 +37,7 @@ fn compile() {
fn compile_error() {
let mut template = jsonpath::compile("$[");
if let Err(JsonPathError::Path(_)) = template(&Value::Null) {
assert!(true);
} else {
assert!(false);
}
assert!(template(&Value::Null).is_err());
}
setup();

7
tests/mutable.rs
View File

@ -20,11 +20,8 @@ fn selector_mut() {
.unwrap()
.value(read_json("./benches/example.json"))
.replace_with(&mut |v| {
match v {
Value::Number(n) => {
nums.push(n.as_f64().unwrap());
}
_ => {}
if let Value::Number(n) = v {
nums.push(n.as_f64().unwrap());
}
Value::String("a".to_string())
})