Merge pull request #205 from open-telemetry/dependabot/cargo/regex-1.…

…10.5 chore(deps): bump regex from 1.10.4 to 1.10.5
open-telemetry · Jun 14, 2024 · 3ff495a · 3ff495a
2 parents 1f5075c + 611b237
commit 3ff495a
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 9 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git 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
@@ -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

diff --git 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 {