Remove lazy_static and htmlescape dependencies

lukaslueg · Jul 14, 2024 · 9e6e21b · 9e6e21b
1 parent 861844c
commit 9e6e21b
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 27 deletions.
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -6,7 +6,7 @@ jobs:
   fmt:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@stable
         with:
           components: rustfmt
@@ -15,7 +15,7 @@ jobs:
   clippy:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@stable
         with:
           components: clippy
@@ -24,11 +24,19 @@ jobs:
   test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@stable
       - run: |
           cargo test --no-default-features
           cargo test --all-features
           sudo apt-get update && sudo apt-get install -y libxml2-utils
           cargo test -- --ignored
           cargo test --features visual-debug -- --ignored
+
+  examples:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: dtolnay/rust-toolchain@stable
+      - run: cargo run --example src_to_svg
+      - run: cargo run --example various
diff --git a/Cargo.toml b/Cargo.toml
@@ -10,15 +10,13 @@ readme = "README.md"
 exclude = ["examples/*.jpeg", "examples/*.jpg", "examples/*.svg", "examples/*.html"]
 
 [dependencies]
-syn = { version = "2.0", features = ["full", "parsing", "extra-traits"], default_features=false }
-railroad = "0.2"
+syn = { version = "2.0", features = ["full", "parsing", "extra-traits"], default-features=false }
+railroad = { version = "0.3.1" }
 proc-macro2 = { version = "1.0", default-features=false }
 
 [dev-dependencies]
-lazy_static = "1.1"
-quote = { version = "1.0", default_features = false }
+quote = { version = "1.0", default-features = false }
 railroad_verification = "0.1"
-htmlescape = "0.3"
 
 [features]
 visual-debug = ["railroad/visual-debug"]
diff --git a/examples/nom4_method.svg b/examples/nom4_method.svg
diff --git a/examples/various.rs b/examples/various.rs
@@ -1,4 +1,3 @@
-use htmlescape;
 use macro_railroad;
 use railroad;
 use std::fs;
@@ -86,7 +85,7 @@ pub fn to_example_page(
     outp.write_all(b"</style>")?;
     outp.write_all(b"</head><body>")?;
 
-    write!(outp, "<h1>{}</h1>", htmlescape::encode_minimal(title))?;
+    write!(outp, "<h1>{}</h1>", railroad::svg::encode_minimal(title))?;
     outp.write_all(b"<div>")?;
     let mut names = Vec::with_capacity(examples.len());
     outp.write_all(b"<div class=\"examples\">")?;
@@ -96,23 +95,23 @@ pub fn to_example_page(
         write!(
             outp,
             "<div class=\"example\" id=\"{}\">",
-            htmlescape::encode_attribute(&name)
+            railroad::svg::encode_attribute(&name)
         )?;
         write!(
             outp,
             "<a href=\"#{}\">",
-            htmlescape::encode_attribute(&name)
+            railroad::svg::encode_attribute(&name)
         )?;
         write!(
             outp,
             "<h3>Macro <i>`{}`</i></h3></a>",
-            htmlescape::encode_minimal(&name)
+            railroad::svg::encode_minimal(&name)
         )?;
         names.push(name);
         write!(
             outp,
             "<pre class=\"rust\">{}</pre><br>",
-            htmlescape::encode_minimal(src)
+            railroad::svg::encode_minimal(src)
         )?;
         let dia_svg = dia.to_string();
         let dia_opt_svg = dia_opt.to_string();

diff --git a/src/diagram.rs b/src/diagram.rs
@@ -280,7 +280,7 @@ fn into_primitive(m: lowering::Matcher) -> Box<dyn railroad::Node> {
             let mut nonterm = railroad::NonTerminal::new(name);
             nonterm
                 .attr("class".to_owned())
-                .or_insert_with(Default::default)
+                .or_default()
                 .push_str(fragment_to_class(&fragment));
             Box::new(nonterm)
         }

diff --git a/src/lowering.rs b/src/lowering.rs
@@ -465,7 +465,7 @@ impl InspectVisitor for NonTerminalCollector {
             Matcher::NonTerminal { name, fragment } => {
                 self.bag
                     .entry(fragment.clone())
-                    .or_insert_with(Default::default)
+                    .or_default()
                     .insert(name.clone());
             }
             other => self.visit_children(other),

diff --git a/tests/verification.rs b/tests/verification.rs
@@ -3,13 +3,11 @@
 ///
 /// This calls out to the `xmllint` tool from libxml2, which may not be available.
 /// The test is therefor ignored by default; use `cargo test -- --ignored`
+use std::sync::OnceLock;
 
-#[macro_use]
-extern crate lazy_static;
-
-lazy_static! {
-    static ref VERIFIER: railroad_verification::Verifier =
-        railroad_verification::Verifier::new().unwrap();
+fn init_verifier() -> &'static railroad_verification::Verifier {
+    static VERIFIER: OnceLock<railroad_verification::Verifier> = OnceLock::new();
+    VERIFIER.get_or_init(|| railroad_verification::Verifier::new().unwrap())
 }
 
 fn to_diagram(src: &str) -> (String, Vec<(&'static str, String)>) {
@@ -51,7 +49,7 @@ macro_rules! verify {
                 eprintln!("Parsed `{}` as macro '{}'", stringify!($testname), name);
                 for (variant, dia) in dias.into_iter() {
                     eprintln!("Verifying variant `{}`", variant);
-                    if let Err(e) = VERIFIER.verify(dia) {
+                    if let Err(e) = init_verifier().verify(dia) {
                         eprintln!("{:?}", e);
                         panic!("Failed to verifiy `{}`", name);
                     }