extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-08-16 14:41:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

replace lazy_static with once_cell (#7502)

Browse Source 
replacing the dependence on `lazy_static` with `once_cell`, this will
ensure that variables are initialized when needed instead of startup
time.
This commit is contained in:
Jaffar Ashoor
2022-12-17 21:30:04 +03:00
committed by GitHub
parent 90849a067f
commit c3c41a61b0
11 changed files with 69 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crates/nu-json/Cargo.toml
View File

@ -14,8 +14,6 @@ preserve_order = ["linked-hash-map", "linked-hash-map/serde_impl"]
default = ["preserve_order"]
[dependencies]
fancy-regex = "0.10.0"
lazy_static = "1"
linked-hash-map = { version="0.5", optional=true }
num-traits = "0.2.14"
serde = "1.0"

20
crates/nu-json/src/ser.rs
View File

@ -10,12 +10,6 @@ use std::num::FpCategory;
use super::error::{Error, ErrorCode, Result};
use serde::ser;
//use super::util::ParseNumber;
use fancy_regex::Regex;
use lazy_static::lazy_static;
/// A structure for serializing Rust values into Hjson.
pub struct Serializer<W, F> {
writer: W,
@ -839,15 +833,6 @@ where
W: io::Write,
F: Formatter,
{
lazy_static! {
// NEEDS_ESCAPE tests if the string can be written without escapes
static ref NEEDS_ESCAPE: Regex = Regex::new("[\\\\\"\x00-\x1f\x7f-\u{9f}\u{00ad}\u{0600}-\u{0604}\u{070f}\u{17b4}\u{17b5}\u{200c}-\u{200f}\u{2028}-\u{202f}\u{2060}-\u{206f}\u{feff}\u{fff0}-\u{ffff}]").expect("Internal error: json parsing");
// NEEDS_QUOTES tests if the string can be written as a quoteless string (includes needsEscape but without \\ and \")
static ref NEEDS_QUOTES: Regex = Regex::new("^\\s|^\"|^'''|^#|^/\\*|^//|^\\{|^\\}|^\\[|^\\]|^:|^,|\\s$|[\x00-\x1f\x7f-\u{9f}\u{00ad}\u{0600}-\u{0604}\u{070f}\u{17b4}\u{17b5}\u{200c}-\u{200f}\u{2028}-\u{202f}\u{2060}-\u{206f}\u{feff}\u{fff0}-\u{ffff}]").expect("Internal error: json parsing");
// starts with a keyword and optionally is followed by a comment
static ref STARTS_WITH_KEYWORD: Regex = Regex::new(r#"^(true|false|null)\s*((,|\]|\}|#|//|/\*).*)?$"#).expect("Internal error: json parsing");
}
if value.is_empty() {
formatter.start_value(wr)?;
return escape_bytes(wr, value.as_bytes());
@ -863,11 +848,6 @@ pub fn escape_key<W>(wr: &mut W, value: &str) -> Result<()>
where
W: io::Write,
{
lazy_static! {
static ref NEEDS_ESCAPE_NAME: Regex =
Regex::new(r#"[,\{\[\}\]\s:#"]|//|/\*|'''|^$"#).expect("Internal error: json parsing");
}
escape_bytes(wr, value.as_bytes()).map_err(From::from)
}