Replace lazy_static with once_cell

Author: Hendrik van Antwerpen

tree-sitter-stack-graphs/Cargo.toml

@@ -45,9 +45,9 @@ dialoguer = { version = "0.10", optional = true }
 env_logger = { version = "0.9", optional = true }
 indoc = { version = "1.0", optional = true }
 itertools = "0.10"
-lazy_static = "1.4"
 log = "0.4"
 lsp-positions = { version="0.3", path="../lsp-positions" }
+once_cell = "1"
 pathdiff = { version = "0.2.1", optional = true }
 regex = "1"
 rust-ini = "0.18"

tree-sitter-stack-graphs/src/cli/init.rs

@@ -14,7 +14,7 @@ use dialoguer::Select;
 use dialoguer::Validator;
 use indoc::printdoc;
 use indoc::writedoc;
-use lazy_static::lazy_static;
+use once_cell::sync::Lazy;
 use regex::Regex;
 use std::fs;
 use std::fs::File;
@@ -31,12 +31,12 @@ mod license;
 
 const TSSG_VERSION: &str = env!("CARGO_PKG_VERSION");
 
-lazy_static! {
-    static ref VALID_CRATE_NAME: Regex = Regex::new(r"^[a-zA-Z_-][a-zA-Z0-9_-]*$").unwrap();
-    static ref VALID_CRATE_VERSION: Regex = Regex::new(r"^[0-9]+\.[0-9]+\.[0-9]+$").unwrap();
-    static ref VALID_DEPENDENCY_VERSION: Regex =
-        Regex::new(r"^[~^]?[0-9]+(\.[0-9]+(\.[0-9]+)?)?$").unwrap();
-}
+static VALID_CRATE_NAME: Lazy<Regex> =
+    Lazy::new(|| Regex::new(r"^[a-zA-Z_-][a-zA-Z0-9_-]*$").unwrap());
+static VALID_CRATE_VERSION: Lazy<Regex> =
+    Lazy::new(|| Regex::new(r"^[0-9]+\.[0-9]+\.[0-9]+$").unwrap());
+static VALID_DEPENDENCY_VERSION: Lazy<Regex> =
+    Lazy::new(|| Regex::new(r"^[~^]?[0-9]+(\.[0-9]+(\.[0-9]+)?)?$").unwrap());
 
 /// Initialize project
 #[derive(Args)]

tree-sitter-stack-graphs/src/lib.rs

@@ -309,8 +309,8 @@
 //! ```
 
 use controlled_option::ControlledOption;
-use lazy_static::lazy_static;
 use lsp_positions::SpanCalculator;
+use once_cell::sync::Lazy;
 use stack_graphs::arena::Handle;
 use stack_graphs::graph::File;
 use stack_graphs::graph::Node;
@@ -368,19 +368,16 @@ static SYMBOL_ATTR: &'static str = "symbol";
 static TYPE_ATTR: &'static str = "type";
 
 // Expected attributes per node type
-lazy_static! {
-    static ref DROP_SCOPES_ATTRS: HashSet<&'static str> = HashSet::from([TYPE_ATTR]);
-    static ref POP_SCOPED_SYMBOL_ATTRS: HashSet<&'static str> =
-        HashSet::from([TYPE_ATTR, SYMBOL_ATTR, IS_DEFINITION_ATTR]);
-    static ref POP_SYMBOL_ATTRS: HashSet<&'static str> =
-        HashSet::from([TYPE_ATTR, SYMBOL_ATTR, IS_DEFINITION_ATTR]);
-    static ref PUSH_SCOPED_SYMBOL_ATTRS: HashSet<&'static str> =
-        HashSet::from([TYPE_ATTR, SYMBOL_ATTR, SCOPE_ATTR, IS_REFERENCE_ATTR]);
-    static ref PUSH_SYMBOL_ATTRS: HashSet<&'static str> =
-        HashSet::from([TYPE_ATTR, SYMBOL_ATTR, IS_REFERENCE_ATTR]);
-    static ref SCOPE_ATTRS: HashSet<&'static str> =
-        HashSet::from([TYPE_ATTR, IS_EXPORTED_ATTR, IS_ENDPOINT_ATTR]);
-}
+static POP_SCOPED_SYMBOL_ATTRS: Lazy<HashSet<&'static str>> =
+    Lazy::new(|| HashSet::from([TYPE_ATTR, SYMBOL_ATTR, IS_DEFINITION_ATTR]));
+static POP_SYMBOL_ATTRS: Lazy<HashSet<&'static str>> =
+    Lazy::new(|| HashSet::from([TYPE_ATTR, SYMBOL_ATTR, IS_DEFINITION_ATTR]));
+static PUSH_SCOPED_SYMBOL_ATTRS: Lazy<HashSet<&'static str>> =
+    Lazy::new(|| HashSet::from([TYPE_ATTR, SYMBOL_ATTR, SCOPE_ATTR, IS_REFERENCE_ATTR]));
+static PUSH_SYMBOL_ATTRS: Lazy<HashSet<&'static str>> =
+    Lazy::new(|| HashSet::from([TYPE_ATTR, SYMBOL_ATTR, IS_REFERENCE_ATTR]));
+static SCOPE_ATTRS: Lazy<HashSet<&'static str>> =
+    Lazy::new(|| HashSet::from([TYPE_ATTR, IS_EXPORTED_ATTR, IS_ENDPOINT_ATTR]));
 
 // Edge attribute names
 static PRECEDENCE_ATTR: &'static str = "precedence";

tree-sitter-stack-graphs/src/loader.rs

@@ -9,7 +9,7 @@
 
 use ini::Ini;
 use itertools::Itertools;
-use lazy_static::lazy_static;
+use once_cell::sync::Lazy;
 use regex::Regex;
 use stack_graphs::graph::StackGraph;
 use std::collections::HashMap;
@@ -29,12 +29,10 @@ use crate::CancellationFlag;
 use crate::FileAnalyzer;
 use crate::StackGraphLanguage;
 
-lazy_static! {
-    pub static ref DEFAULT_TSG_PATHS: Vec<LoadPath> =
-        vec![LoadPath::Grammar("queries/stack-graphs".into())];
-    pub static ref DEFAULT_BUILTINS_PATHS: Vec<LoadPath> =
-        vec![LoadPath::Grammar("queries/builtins".into())];
-}
+pub static DEFAULT_TSG_PATHS: Lazy<Vec<LoadPath>> =
+    Lazy::new(|| vec![LoadPath::Grammar("queries/stack-graphs".into())]);
+pub static DEFAULT_BUILTINS_PATHS: Lazy<Vec<LoadPath>> =
+    Lazy::new(|| vec![LoadPath::Grammar("queries/builtins".into())]);
 
 /// Data type that holds all information to recognize and analyze files for a language
 pub struct LanguageConfiguration {

tree-sitter-stack-graphs/src/test.rs

@@ -58,10 +58,10 @@
 //! Any content before the first fragment header of the file is ignored, and will not be part of the test.
 
 use itertools::Itertools;
-use lazy_static::lazy_static;
 use lsp_positions::Position;
 use lsp_positions::PositionedSubstring;
 use lsp_positions::SpanCalculator;
+use once_cell::sync::Lazy;
 use regex::Regex;
 use stack_graphs::arena::Handle;
 use stack_graphs::assert::Assertion;
@@ -85,15 +85,14 @@ const DEFINED: &'static str = "defined";
 const DEFINES: &'static str = "defines";
 const REFERS: &'static str = "refers";
 
-lazy_static! {
-    static ref PATH_REGEX: Regex = Regex::new(r#"---\s*path:\s*([^\s]+)\s*---"#).unwrap();
-    static ref GLOBAL_REGEX: Regex =
-        Regex::new(r#"---\s*global:\s*([^\s]+)=([^\s]+)\s*---"#).unwrap();
-    static ref ASSERTION_REGEX: Regex =
-        Regex::new(r#"(\^)\s*(\w+):\s*([^\s,]+(?:\s*,\s*[^\s,]+)*)?"#).unwrap();
-    static ref LINE_NUMBER_REGEX: Regex = Regex::new(r#"\d+"#).unwrap();
-    static ref NAME_REGEX: Regex = Regex::new(r#"[^\s,]+"#).unwrap();
-}
+static PATH_REGEX: Lazy<Regex> =
+    Lazy::new(|| Regex::new(r#"---\s*path:\s*([^\s]+)\s*---"#).unwrap());
+static GLOBAL_REGEX: Lazy<Regex> =
+    Lazy::new(|| Regex::new(r#"---\s*global:\s*([^\s]+)=([^\s]+)\s*---"#).unwrap());
+static ASSERTION_REGEX: Lazy<Regex> =
+    Lazy::new(|| Regex::new(r#"(\^)\s*(\w+):\s*([^\s,]+(?:\s*,\s*[^\s,]+)*)?"#).unwrap());
+static LINE_NUMBER_REGEX: Lazy<Regex> = Lazy::new(|| Regex::new(r#"\d+"#).unwrap());
+static NAME_REGEX: Lazy<Regex> = Lazy::new(|| Regex::new(r#"[^\s,]+"#).unwrap());
 
 /// An error that can occur while parsing tests
 #[derive(Debug, Error)]

tree-sitter-stack-graphs/tests/it/loader.rs

@@ -5,7 +5,7 @@
 // Please see the LICENSE-APACHE or LICENSE-MIT files in this distribution for license details.
 // ------------------------------------------------------------------------------------------------
 
-use lazy_static::lazy_static;
+use once_cell::sync::Lazy;
 use pretty_assertions::assert_eq;
 use stack_graphs::graph::StackGraph;
 use std::path::PathBuf;
@@ -15,13 +15,13 @@ use tree_sitter_stack_graphs::loader::Loader;
 use tree_sitter_stack_graphs::NoCancellation;
 use tree_sitter_stack_graphs::StackGraphLanguage;
 
-lazy_static! {
-    static ref PATH: PathBuf = PathBuf::from("test.py");
-    static ref TSG: String = r#"
+static PATH: Lazy<PathBuf> = Lazy::new(|| PathBuf::from("test.py"));
+static TSG: Lazy<String> = Lazy::new(|| {
+    r#"
       (module) {}
     "#
-    .to_string();
-}
+    .to_string()
+});
 
 #[test]
 fn can_load_from_provided_language_configuration() {

tree-sitter-stack-graphs/tests/it/test.rs

@@ -5,7 +5,7 @@
 // Please see the LICENSE-APACHE or LICENSE-MIT files in this distribution for license details.
 // ------------------------------------------------------------------------------------------------
 
-use lazy_static::lazy_static;
+use once_cell::sync::Lazy;
 use pretty_assertions::assert_eq;
 use stack_graphs::arena::Handle;
 use stack_graphs::graph::File;
@@ -18,9 +18,9 @@ use tree_sitter_stack_graphs::LoadError;
 use tree_sitter_stack_graphs::NoCancellation;
 use tree_sitter_stack_graphs::StackGraphLanguage;
 
-lazy_static! {
-    static ref PATH: PathBuf = PathBuf::from("test.py");
-    static ref TSG: String = r#"
+static PATH: Lazy<PathBuf> = Lazy::new(|| PathBuf::from("test.py"));
+static TSG: Lazy<String> = Lazy::new(|| {
+    r#"
       global ROOT_NODE
       (module) @mod {
           node @mod.lexical_in
@@ -50,11 +50,15 @@ lazy_static! {
           attr (@name.ref) type = "push_symbol", symbol = (source-text @name), source_node = @name, is_reference
           edge @name.ref -> @stmt.lexical_in
       }
-    "#.to_string();
-    static ref TSG_WITH_PKG: String = r#"
+    "#.to_string()
+});
+static TSG_WITH_PKG: Lazy<String> = Lazy::new(|| {
+    r#"
       global PKG
-    "#.to_string() + &TSG;
-}
+    "#
+    .to_string()
+        + &TSG
+});
 
 fn build_stack_graph_into(
     graph: &mut StackGraph,