From 8879ed6ae276636b6247c63dd10de27677f56916 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 10 Jun 2024 21:24:19 +0000 Subject: [PATCH 1/2] chore(deps): bump regex from 1.10.4 to 1.10.5 Bumps [regex](https://github.com/rust-lang/regex) from 1.10.4 to 1.10.5. - [Release notes](https://github.com/rust-lang/regex/releases) - [Changelog](https://github.com/rust-lang/regex/blob/master/CHANGELOG.md) - [Commits](https://github.com/rust-lang/regex/compare/1.10.4...1.10.5) --- updated-dependencies: - dependency-name: regex dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- crates/weaver_forge/Cargo.toml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7be794ba..e4e2241a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2737,9 +2737,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.4" +version = "1.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" +checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" dependencies = [ "aho-corasick", "memchr", diff --git a/Cargo.toml b/Cargo.toml index f9224b19..1a2e313f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -41,7 +41,7 @@ serde_yaml = "0.9.32" serde_json = { version = "1.0.116"} thiserror = "1.0.58" ureq = "2.9.7" -regex = "1.10.3" +regex = "1.10.5" rayon = "1.10.0" ordered-float = { version = "4.2.0", features = ["serde", "schemars"] } walkdir = "2.5.0" diff --git a/crates/weaver_forge/Cargo.toml b/crates/weaver_forge/Cargo.toml index 1c6278b7..1d20fefc 100644 --- a/crates/weaver_forge/Cargo.toml +++ b/crates/weaver_forge/Cargo.toml @@ -25,7 +25,7 @@ jaq-std = "1.2.1" jaq-interpret = "1.2.1" jaq-parse = "1.0.2" indexmap = "2.2.6" -regex = "1.10.4" +regex = "1.10.5" markdown = "=1.0.0-alpha.17" itertools.workspace = true From 611b237b2a6a8e4e03b474c083d90ea25a3d65a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Laurent=20Qu=C3=A9rel?= Date: Fri, 14 Jun 2024 14:38:48 +0000 Subject: [PATCH 2/2] chore(lint): Fix clippy issue --- src/main.rs | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/main.rs b/src/main.rs index dc5b8d07..11e0ea11 100644 --- a/src/main.rs +++ b/src/main.rs @@ -120,11 +120,7 @@ fn process_diagnostics( cmd_result: CmdResult, logger: impl Logger + Sync + Clone, ) -> ExitDirectives { - let diagnostic_args = if let Some(diagnostic_args) = cmd_result.diagnostic_args { - diagnostic_args - } else { - DiagnosticArgs::default() // Default diagnostic arguments; - }; + let diagnostic_args = cmd_result.diagnostic_args.unwrap_or_default(); let mut exit_directives = if let Ok(exit_directives) = &cmd_result.command_result { exit_directives.clone() } else {