Skip to content

Commit 5928084

Browse files
authored
Replace usages of lazy_static with once_cell (#279)
1 parent be10706 commit 5928084

File tree

3 files changed

+5
-13
lines changed

3 files changed

+5
-13
lines changed

partiql-parser/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ logos = "~0.12.0"
4141
itertools = "~0.10.3"
4242

4343
regex = "1.7"
44-
lazy_static = "~1.4.0"
44+
once_cell = "1"
4545

4646
serde = { version = "1.*", features = ["derive"], optional = true }
4747

partiql-parser/src/parse/mod.rs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,8 @@ mod parser_state;
88
use crate::error::{ParseError, UnexpectedTokenData};
99
use crate::lexer;
1010
use crate::parse::parser_state::{IdGenerator, ParserState};
11-
use crate::preprocessor::{built_ins, FnExprSet, PreprocessingPartiqlLexer};
11+
use crate::preprocessor::{PreprocessingPartiqlLexer, BUILT_INS};
1212
use lalrpop_util as lpop;
13-
use lazy_static::lazy_static;
1413
use partiql_ast::ast;
1514
use partiql_ast::ast::NodeId;
1615
use partiql_source_map::line_offset_tracker::LineOffsetTracker;
@@ -51,10 +50,6 @@ pub(crate) struct ErrorData<'input> {
5150

5251
pub(crate) type AstResult<'input> = Result<AstData, ErrorData<'input>>;
5352

54-
lazy_static! {
55-
static ref BUILT_INS: FnExprSet<'static> = built_ins();
56-
}
57-
5853
/// Parse PartiQL query text into an AST.
5954
pub(crate) fn parse_partiql(s: &str) -> AstResult {
6055
parse_partiql_with_state(s, ParserState::default())

partiql-parser/src/preprocessor.rs

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,11 @@ use crate::error::LexError;
1010
use crate::lexer::{InternalLexResult, LexResult, PartiqlLexer, Spanned, Token};
1111

1212
use crate::token_parser::{BufferedToken, TokenParser};
13+
use once_cell::sync::Lazy;
1314
use partiql_source_map::line_offset_tracker::LineOffsetTracker;
1415

16+
pub(crate) static BUILT_INS: Lazy<FnExprSet<'static>> = Lazy::new(|| built_ins());
17+
1518
/// A single "function expression" argument match.
1619
#[derive(Debug, Clone)]
1720
pub(crate) enum FnExprArgMatch<'a> {
@@ -582,12 +585,6 @@ mod tests {
582585

583586
use crate::ParseError;
584587

585-
use lazy_static::lazy_static;
586-
587-
lazy_static! {
588-
static ref BUILT_INS: FnExprSet<'static> = built_ins();
589-
}
590-
591588
#[test]
592589
fn cast() -> Result<(), ParseError<'static>> {
593590
let query = "CAST(a AS VARCHAR)";

0 commit comments

Comments
 (0)