From c63cb014a045642efbbf1363666a4eda247163a3 Mon Sep 17 00:00:00 2001
From: klensy <klensy@users.noreply.github.com>
Date: Tue, 1 Jun 2021 18:25:36 +0300
Subject: [PATCH 1/2] updated shlex for jsondocck
---
Cargo.lock | 10 ++--------
src/tools/jsondocck/Cargo.toml | 2 +-
2 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index df7d844194148..6e674d7257f9d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1747,7 +1747,7 @@ dependencies = [
"regex",
"serde",
"serde_json",
- "shlex 0.1.1",
+ "shlex",
]
[[package]]
@@ -2128,7 +2128,7 @@ dependencies = [
"serde",
"serde_derive",
"serde_json",
- "shlex 1.0.0",
+ "shlex",
"tempfile",
"toml",
]
@@ -4794,12 +4794,6 @@ version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "45bb67a18fa91266cc7807181f62f9178a6873bfad7dc788c42e6430db40184f"
-[[package]]
-name = "shlex"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2"
-
[[package]]
name = "shlex"
version = "1.0.0"
diff --git a/src/tools/jsondocck/Cargo.toml b/src/tools/jsondocck/Cargo.toml
index a6efc4c9a6b5b..eb1c422ef7293 100644
--- a/src/tools/jsondocck/Cargo.toml
+++ b/src/tools/jsondocck/Cargo.toml
@@ -9,7 +9,7 @@ jsonpath_lib = "0.2"
getopts = "0.2"
regex = "1.4"
lazy_static = "1.4"
-shlex = "0.1"
+shlex = "1.0"
serde = "1.0"
serde_json = "1.0"
fs-err = "2.5.0"
From 5afc594e6294cee451ded335397cade6a9098bd1 Mon Sep 17 00:00:00 2001
From: klensy <klensy@users.noreply.github.com>
Date: Tue, 1 Jun 2021 19:44:10 +0300
Subject: [PATCH 2/2] replace lazy_static with once_cell, drop direct
dependency on serde
---
Cargo.lock | 3 +--
src/tools/jsondocck/Cargo.toml | 3 +--
src/tools/jsondocck/src/main.rs | 12 ++++++------
3 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index 6e674d7257f9d..7badb93bce553 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1743,9 +1743,8 @@ dependencies = [
"fs-err",
"getopts",
"jsonpath_lib",
- "lazy_static",
+ "once_cell",
"regex",
- "serde",
"serde_json",
"shlex",
]
diff --git a/src/tools/jsondocck/Cargo.toml b/src/tools/jsondocck/Cargo.toml
index eb1c422ef7293..b5f1554dbe4df 100644
--- a/src/tools/jsondocck/Cargo.toml
+++ b/src/tools/jsondocck/Cargo.toml
@@ -8,8 +8,7 @@ edition = "2018"
jsonpath_lib = "0.2"
getopts = "0.2"
regex = "1.4"
-lazy_static = "1.4"
shlex = "1.0"
-serde = "1.0"
serde_json = "1.0"
fs-err = "2.5.0"
+once_cell = "1.0"
diff --git a/src/tools/jsondocck/src/main.rs b/src/tools/jsondocck/src/main.rs
index 216890d59ad6c..b8ea10f3d2277 100644
--- a/src/tools/jsondocck/src/main.rs
+++ b/src/tools/jsondocck/src/main.rs
@@ -1,5 +1,5 @@
use jsonpath_lib::select;
-use lazy_static::lazy_static;
+use once_cell::sync::Lazy;
use regex::{Regex, RegexBuilder};
use serde_json::Value;
use std::borrow::Cow;
@@ -94,19 +94,19 @@ impl fmt::Display for CommandKind {
}
}
-lazy_static! {
- static ref LINE_PATTERN: Regex = RegexBuilder::new(
+static LINE_PATTERN: Lazy<Regex> = Lazy::new(|| {
+ RegexBuilder::new(
r#"
\s(?P<invalid>!?)@(?P<negated>!?)
(?P<cmd>[A-Za-z]+(?:-[A-Za-z]+)*)
(?P<args>.*)$
- "#
+ "#,
)
.ignore_whitespace(true)
.unicode(true)
.build()
- .unwrap();
-}
+ .unwrap()
+});
fn print_err(msg: &str, lineno: usize) {
eprintln!("Invalid command: {} on line {}", msg, lineno)