diff options
| author | klensy <klensy@users.noreply.github.com> | 2021-06-01 19:44:10 +0300 |
|---|---|---|
| committer | klensy <klensy@users.noreply.github.com> | 2021-06-01 19:44:10 +0300 |
| commit | 5afc594e6294cee451ded335397cade6a9098bd1 (patch) | |
| tree | d75a4f3621743cb946278228875626bbe8f22000 | |
| parent | c63cb014a045642efbbf1363666a4eda247163a3 (diff) | |
| download | rust-5afc594e6294cee451ded335397cade6a9098bd1.tar.gz rust-5afc594e6294cee451ded335397cade6a9098bd1.zip | |
replace lazy_static with once_cell, drop direct dependency on serde
| -rw-r--r-- | Cargo.lock | 3 | ||||
| -rw-r--r-- | src/tools/jsondocck/Cargo.toml | 3 | ||||
| -rw-r--r-- | src/tools/jsondocck/src/main.rs | 12 |
3 files changed, 8 insertions, 10 deletions
diff --git a/Cargo.lock b/Cargo.lock index 6e674d7257f..7badb93bce5 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 eb1c422ef72..b5f1554dbe4 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 216890d59ad..b8ea10f3d22 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) |