Skip to content

Commit

Permalink
chore(cargo): update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
yamafaktory committed Feb 3, 2025
1 parent 8409f48 commit 4e191a8
Show file tree
Hide file tree
Showing 9 changed files with 80 additions and 72 deletions.
52 changes: 26 additions & 26 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ members = [
]

[workspace.dependencies]
thiserror = "2.0.4"
serde_json = { features = ["preserve_order", "unbounded_depth"], version = "1.0.133" }
thiserror = "2.0.11"
serde_json = { features = ["preserve_order", "unbounded_depth"], version = "1.0.138" }

[workspace.package]
authors = ["Davy Duperron <[email protected]>"]
Expand Down
2 changes: 1 addition & 1 deletion crates/jql-parser/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ version.workspace = true

[dependencies]
thiserror.workspace = true
winnow = { version = "0.6.20", features = ["simd"] }
winnow = { version = "0.7.0", features = ["simd"] }

[lib]
path = "src/lib.rs"
42 changes: 21 additions & 21 deletions crates/jql-parser/src/combinators.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use winnow::{
PResult,
Parser,
Result,
ascii::{
digit1,
multispace0,
Expand Down Expand Up @@ -82,12 +82,12 @@ where
}

/// A combinator which parses a stringified number as an `Index`.
pub(crate) fn parse_number(input: &mut &str) -> PResult<Index> {
pub(crate) fn parse_number(input: &mut &str) -> Result<Index> {
digit1.parse_to().parse_next(input)
}

/// A combinator which parses a key surrounded by double quotes.
pub(crate) fn parse_key<'a>(input: &mut &'a str) -> PResult<&'a str> {
pub(crate) fn parse_key<'a>(input: &mut &'a str) -> Result<&'a str> {
trim(delimited(
DOUBLE_QUOTE,
take_until(0.., r#"""#),
Expand All @@ -97,22 +97,22 @@ pub(crate) fn parse_key<'a>(input: &mut &'a str) -> PResult<&'a str> {
}

/// A combinator which parses a list of `Index`.
pub(crate) fn parse_indexes(input: &mut &str) -> PResult<Vec<Index>> {
pub(crate) fn parse_indexes(input: &mut &str) -> Result<Vec<Index>> {
separated(1.., parse_number, trim(COMMA)).parse_next(input)
}

/// A combinator which parses a list of keys.
fn parse_keys<'a>(input: &mut &'a str) -> PResult<Vec<&'a str>> {
fn parse_keys<'a>(input: &mut &'a str) -> Result<Vec<&'a str>> {
trim(separated(1.., parse_key, trim(COMMA))).parse_next(input)
}

/// A combinator which parses a list of keys surrounded by curly braces.
pub(crate) fn parse_multi_key<'a>(input: &mut &'a str) -> PResult<Vec<&'a str>> {
pub(crate) fn parse_multi_key<'a>(input: &mut &'a str) -> Result<Vec<&'a str>> {
delimited(CURLY_BRACKET_OPEN, parse_keys, CURLY_BRACKET_CLOSE).parse_next(input)
}

/// A combinator which parses an array of `Index`.
pub(crate) fn parse_array_index(input: &mut &str) -> PResult<Vec<Index>> {
pub(crate) fn parse_array_index(input: &mut &str) -> Result<Vec<Index>> {
delimited(
trim(SQUARE_BRACKET_OPEN),
parse_indexes,
Expand All @@ -122,7 +122,7 @@ pub(crate) fn parse_array_index(input: &mut &str) -> PResult<Vec<Index>> {
}

/// A combinator which parses an array range.
pub(crate) fn parse_array_range(input: &mut &str) -> PResult<(Option<Index>, Option<Index>)> {
pub(crate) fn parse_array_range(input: &mut &str) -> Result<(Option<Index>, Option<Index>)> {
trim(delimited(
SQUARE_BRACKET_OPEN,
separated_pair(opt(parse_number), trim(COLON), opt(parse_number)),
Expand All @@ -132,7 +132,7 @@ pub(crate) fn parse_array_range(input: &mut &str) -> PResult<(Option<Index>, Opt
}

/// A combinator which parses a list of index surrounded by curly braces.
pub(crate) fn parse_object_index(input: &mut &str) -> PResult<Vec<Index>> {
pub(crate) fn parse_object_index(input: &mut &str) -> Result<Vec<Index>> {
delimited(
trim(CURLY_BRACKET_OPEN),
parse_indexes,
Expand All @@ -142,7 +142,7 @@ pub(crate) fn parse_object_index(input: &mut &str) -> PResult<Vec<Index>> {
}

/// A combinator which parses an object range.
pub(crate) fn parse_object_range(input: &mut &str) -> PResult<(Option<Index>, Option<Index>)> {
pub(crate) fn parse_object_range(input: &mut &str) -> Result<(Option<Index>, Option<Index>)> {
delimited(
trim(CURLY_BRACKET_OPEN),
separated_pair(opt(parse_number), trim(COLON), opt(parse_number)),
Expand All @@ -152,7 +152,7 @@ pub(crate) fn parse_object_range(input: &mut &str) -> PResult<(Option<Index>, Op
}

/// A combinator which parses any lens value.
pub(crate) fn parse_lens_value<'a>(input: &mut &'a str) -> PResult<LensValue<'a>> {
pub(crate) fn parse_lens_value<'a>(input: &mut &'a str) -> Result<LensValue<'a>> {
dispatch! {peek(any);
'f' => FALSE.value(LensValue::Bool(false)),
't' => TRUE.value(LensValue::Bool(true)),
Expand All @@ -164,7 +164,7 @@ pub(crate) fn parse_lens_value<'a>(input: &mut &'a str) -> PResult<LensValue<'a>
}
//
/// A combinator which parses a lens key.
fn parse_lens_key<'a>(input: &mut &'a str) -> PResult<Token<'a>> {
fn parse_lens_key<'a>(input: &mut &'a str) -> Result<Token<'a>> {
trim(
dispatch! {peek(any);
'[' => {
Expand All @@ -188,14 +188,14 @@ fn parse_lens_key<'a>(input: &mut &'a str) -> PResult<Token<'a>> {
}

/// A combinator which parses multiple lens keys.
fn parse_lens_keys<'a>(input: &mut &'a str) -> PResult<Vec<Token<'a>>> {
fn parse_lens_keys<'a>(input: &mut &'a str) -> Result<Vec<Token<'a>>> {
repeat(1.., parse_lens_key).parse_next(input)
}

/// A combinator which parses a lens.
pub(crate) fn parse_lens<'a>(
input: &mut &'a str,
) -> PResult<(Vec<Token<'a>>, Option<LensValue<'a>>)> {
) -> Result<(Vec<Token<'a>>, Option<LensValue<'a>>)> {
trim((
parse_lens_keys,
opt(preceded(trim(EQUAL), parse_lens_value)),
Expand All @@ -206,7 +206,7 @@ pub(crate) fn parse_lens<'a>(
/// A combinator which parses a list of lenses.
pub(crate) fn parse_lenses<'a>(
input: &mut &'a str,
) -> PResult<Vec<(Vec<Token<'a>>, Option<LensValue<'a>>)>> {
) -> Result<Vec<(Vec<Token<'a>>, Option<LensValue<'a>>)>> {
delimited(
trim(LENSES_START),
separated(1.., parse_lens, trim(COMMA)),
Expand All @@ -216,32 +216,32 @@ pub(crate) fn parse_lenses<'a>(
}

/// A combinator which parses a keys operator.
pub(crate) fn parse_keys_operator<'a>(input: &mut &'a str) -> PResult<&'a str> {
pub(crate) fn parse_keys_operator<'a>(input: &mut &'a str) -> Result<&'a str> {
literal(KEYS).parse_next(input)
}

/// A combinator which parses a flatten operator.
pub(crate) fn parse_flatten_operator<'a>(input: &mut &'a str) -> PResult<&'a str> {
pub(crate) fn parse_flatten_operator<'a>(input: &mut &'a str) -> Result<&'a str> {
literal(FLATTEN).parse_next(input)
}

/// A combinator which parses a pipe in operator.
pub(crate) fn parse_pipe_in_operator<'a>(input: &mut &'a str) -> PResult<&'a str> {
pub(crate) fn parse_pipe_in_operator<'a>(input: &mut &'a str) -> Result<&'a str> {
literal(PIPE_IN).parse_next(input)
}

/// A combinator which parses a pipe out operator.
pub(crate) fn parse_pipe_out_operator<'a>(input: &mut &'a str) -> PResult<&'a str> {
pub(crate) fn parse_pipe_out_operator<'a>(input: &mut &'a str) -> Result<&'a str> {
literal(PIPE_OUT).parse_next(input)
}

/// A combinator which parses a truncate operator.
pub(crate) fn parse_truncate_operator<'a>(input: &mut &'a str) -> PResult<&'a str> {
pub(crate) fn parse_truncate_operator<'a>(input: &mut &'a str) -> Result<&'a str> {
trim(TRUNCATE).parse_next(input)
}

/// A combinator which parses a group separator.
pub(crate) fn parse_group_separator<'a>(input: &mut &'a str) -> PResult<&'a str> {
pub(crate) fn parse_group_separator<'a>(input: &mut &'a str) -> Result<&'a str> {
literal(GROUP_SEP).parse_next(input)
}

Expand Down
6 changes: 3 additions & 3 deletions crates/jql-parser/src/parser.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use winnow::{
PResult,
Parser,
Result,
combinator::{
alt,
dispatch,
Expand Down Expand Up @@ -38,7 +38,7 @@ use crate::{
};

/// Parses the provided input and map it to the first matching token.
fn parse_fragment<'a>(input: &mut &'a str) -> PResult<Token<'a>> {
fn parse_fragment<'a>(input: &mut &'a str) -> Result<Token<'a>> {
trim(
dispatch! {peek(any);
'[' => {
Expand Down Expand Up @@ -87,7 +87,7 @@ fn parse_fragment<'a>(input: &mut &'a str) -> PResult<Token<'a>> {
pub fn parse(input: &str) -> Result<Vec<Token>, JqlParserError> {
let mut parser_iterator = iterator(input, parse_fragment);
let tokens = parser_iterator.collect::<Vec<Token>>();
let result: PResult<_, _> = parser_iterator.finish();
let result: Result<_, _> = parser_iterator.finish();

match result {
Ok((unparsed, ())) => {
Expand Down
2 changes: 1 addition & 1 deletion crates/jql-runner/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ repository.workspace = true
version.workspace = true

[dependencies]
indexmap = { version = "2.7.0", features = ["rayon"] }
indexmap = { version = "2.7.1", features = ["rayon"] }
jql-parser = { path = "../jql-parser", version = "8.0.2" }
rayon = "1.10.0"
serde_json.workspace = true
Expand Down
8 changes: 4 additions & 4 deletions crates/jql/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ repository.workspace = true
version.workspace = true

[dependencies]
anyhow = "1.0.94"
clap = { version = "4.5.23", features = ["derive"] }
anyhow = "1.0.95"
clap = { version = "4.5.27", features = ["derive"] }
colored_json = { version = "5.0.0" }
jql-runner = { path = "../jql-runner", version = "8.0.2" }
serde = "1.0.215"
serde = "1.0.217"
serde_stacker = "0.1.11"
serde_json.workspace = true
tokio = { version = "1.42.0", features = ["fs", "io-std", "io-util", "macros", "rt-multi-thread"] }
tokio = { version = "1.43.0", features = ["fs", "io-std", "io-util", "macros", "rt-multi-thread"] }

[package.metadata.binstall]
pkg-url = "{ repo }/releases/download/{ name }-v{ version }/{ name }-v{ version }-{ target }{ archive-suffix }"
Loading

0 comments on commit 4e191a8

Please sign in to comment.