Skip to content

Commit

Permalink
chore(cargo): update dependencies (#256)
Browse files Browse the repository at this point in the history
  • Loading branch information
yamafaktory committed Feb 16, 2024
1 parent 09fd0c9 commit b65e98a
Show file tree
Hide file tree
Showing 8 changed files with 55 additions and 51 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.

15 changes: 13 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 = "1.0.50"
serde_json = { features = ["preserve_order", "unbounded_depth"], version = "1.0.108" }
thiserror = "1.0.57"
serde_json = { features = ["preserve_order", "unbounded_depth"], version = "1.0.113" }

[workspace.package]
authors = ["Davy Duperron <yamafaktory@gmail.com>"]
Expand All @@ -18,6 +18,17 @@ readme = "README.md"
repository = "https://github.com/yamafaktory/jql"
version = "7.1.3"

[workspace.lints.rust]
missing_debug_implementations = "warn"
missing_docs = "warn"
nonstandard_style = "deny"
rust_2021_compatibility = "forbid"
unreachable_pub = "warn"
unsafe_code = "deny"

[workspace.lints.clippy]
clippy_pedantic = "deny"

# https://github.com/rust-lang/cargo/issues/8264
[profile.release]
codegen-units = 1
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.5.34", features = ["simd"] }
winnow = { version = "0.6.1", features = ["simd"] }

[lib]
path = "src/lib.rs"
19 changes: 12 additions & 7 deletions crates/jql-parser/src/combinators.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ use winnow::{
error::ParserError,
token::{
any,
tag,
take_until0,
literal,
take_until,
},
PResult,
Parser,
Expand Down Expand Up @@ -86,7 +86,12 @@ pub(crate) fn parse_number(input: &mut &str) -> PResult<Index> {

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

/// A combinator which parses a list of `Index`.
Expand Down Expand Up @@ -210,17 +215,17 @@ pub(crate) fn parse_lenses<'a>(

/// A combinator which parses a flatten operator.
pub(crate) fn parse_flatten_operator<'a>(input: &mut &'a str) -> PResult<&'a str> {
tag(FLATTEN).parse_next(input)
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> {
tag(PIPE_IN).parse_next(input)
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> {
tag(PIPE_OUT).parse_next(input)
literal(PIPE_OUT).parse_next(input)
}

/// A combinator which parses a truncate operator.
Expand All @@ -230,7 +235,7 @@ pub(crate) fn parse_truncate_operator<'a>(input: &mut &'a str) -> PResult<&'a st

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

#[cfg(test)]
Expand Down
4 changes: 0 additions & 4 deletions crates/jql-parser/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
#![deny(clippy::pedantic)]
#![deny(unsafe_code, nonstandard_style)]
#![forbid(rust_2021_compatibility)]
#![warn(missing_debug_implementations, missing_docs, unreachable_pub)]
#![doc = include_str!("../README.md")]
#![doc(
html_logo_url = "https://raw.githubusercontent.com/yamafaktory/jql/a438ab0039faf64c3329fb09bae399ae95601000/jql.svg"
Expand Down
4 changes: 0 additions & 4 deletions crates/jql-runner/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
#![deny(clippy::pedantic)]
#![deny(unsafe_code, nonstandard_style)]
#![forbid(rust_2021_compatibility)]
#![warn(missing_debug_implementations, missing_docs, unreachable_pub)]
#![doc = include_str!("../README.md")]
#![doc(
html_logo_url = "https://raw.githubusercontent.com/yamafaktory/jql/a438ab0039faf64c3329fb09bae399ae95601000/jql.svg"
Expand Down
6 changes: 3 additions & 3 deletions crates/jql/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ version = { workspace = true }

[dependencies]
anyhow = "1.0.79"
clap = { version = "4.4.18", features = ["derive"] }
clap = { version = "4.5.0", features = ["derive"] }
colored_json = { version = "4.1.0" }
jql-runner = { path = "../jql-runner", version = "7.1.3" }
serde = "1.0.195"
serde = "1.0.196"
serde_stacker = "0.1.11"
serde_json = { workspace = true }
tokio = { version = "1.35.1", features = ["fs", "io-std", "io-util", "macros", "rt-multi-thread"] }
tokio = { version = "1.36.0", features = ["fs", "io-std", "io-util", "macros", "rt-multi-thread"] }
4 changes: 0 additions & 4 deletions crates/jql/src/main.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
#![deny(clippy::pedantic)]
#![deny(unsafe_code, nonstandard_style)]
#![forbid(rust_2021_compatibility)]
#![warn(missing_debug_implementations, missing_docs)]
#![doc = include_str!("../README.md")]

mod args;
Expand Down

0 comments on commit b65e98a

Please sign in to comment.