Remove 'static lifetime from lrpar_config closure type

Author: ratmice

lrlex/src/lib/ctbuilder.rs

@@ -226,7 +226,7 @@ where
     LexerTypesT::StorageT: Debug + Eq + Hash + ToTokens,
     usize: num_traits::AsPrimitive<LexerTypesT::StorageT>,
 {
-    lrpar_config: Option<Box<dyn Fn(CTParserBuilder<LexerTypesT>) -> CTParserBuilder<LexerTypesT>>>,
+    lrpar_config: Option<Box<dyn Fn(CTParserBuilder<LexerTypesT>) -> CTParserBuilder<LexerTypesT> + 'a>>,
     lexer_path: Option<PathBuf>,
     output_path: Option<PathBuf>,
     lexerkind: Option<LexerKind>,
@@ -313,9 +313,9 @@ where
     ///     .lexer_in_src_dir("calc.l")?
     ///     .build()?;
     /// ```
-    pub fn lrpar_config<F>(mut self, config_func: F) -> Self
+    pub fn lrpar_config<F: 'a>(mut self, config_func: F) -> Self
     where
-        F: 'static + Fn(CTParserBuilder<LexerTypesT>) -> CTParserBuilder<LexerTypesT>,
+        F: Fn(CTParserBuilder<LexerTypesT>) -> CTParserBuilder<LexerTypesT>,
     {
         self.lrpar_config = Some(Box::new(config_func));
         self

lrpar/cttests/build.rs

@@ -3,7 +3,7 @@ use glob::glob;
 #[path = "src/cgen_helper.rs"]
 mod cgen_helper;
 use cfg_aliases::cfg_aliases;
-use cgen_helper::{leaked_path, run_test_path};
+use cgen_helper::run_test_path;
 use lrlex::{CTLexerBuilder, DefaultLexerTypes};
 
 // Compiles the `*.test` files within `src`. Test files are written in Yaml syntax and have 4
@@ -16,7 +16,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
         println!("cargo::rerun-if-changed={}", src?.display());
     }
     for entry in glob("src/*.test")? {
-        run_test_path(leaked_path(entry.unwrap()))?;
+        run_test_path(entry.unwrap())?;
     }
 
     cfg_aliases! {

lrpar/cttests/src/cgen_helper.rs

@@ -7,18 +7,13 @@ use std::{
 };
 use yaml_rust2::YamlLoader;
 
-pub(crate) fn leaked_path<P: AsRef<Path>>(path: P) -> &'static Path {
-    let p = PathBuf::from(path.as_ref()).into_boxed_path();
-    Box::leak(p)
-}
-
 #[allow(dead_code)]
-pub(crate) fn run_test_path(path: &'static Path) -> Result<(), Box<dyn std::error::Error>> {
+pub(crate) fn run_test_path<P: AsRef<Path>>(path: P) -> Result<(), Box<dyn std::error::Error>> {
     let out_dir = env::var("OUT_DIR").unwrap();
-    if path.is_file() {
-        println!("cargo::rerun-if-changed={}", path.display());
+    if path.as_ref().is_file() {
+        println!("cargo::rerun-if-changed={}", path.as_ref().display());
         // Parse test file
-        let s = fs::read_to_string(path).unwrap();
+        let s = fs::read_to_string(path.as_ref()).unwrap();
         let docs = YamlLoader::load_from_str(&s).unwrap();
         let grm = &docs[0]["grammar"].as_str().unwrap();
         let lex = &docs[0]["lexer"].as_str().unwrap();
@@ -66,7 +61,7 @@ pub(crate) fn run_test_path(path: &'static Path) -> Result<(), Box<dyn std::erro
         // filename conventions. If those change, this code will also have to change.
 
         // Create grammar files
-        let base = path.file_stem().unwrap().to_str().unwrap();
+        let base = path.as_ref().file_stem().unwrap().to_str().unwrap();
         let mut pg = PathBuf::from(&out_dir);
         pg.push(format!("{}.test.y", base));
         fs::write(&pg, grm).unwrap();
@@ -89,8 +84,8 @@ pub(crate) fn run_test_path(path: &'static Path) -> Result<(), Box<dyn std::erro
         outl.push(format!("{}.l.rs", base));
         outl.set_extension("rs");
         let mut cl_build = CTLexerBuilder::new()
-            .lrpar_config(move |mut cp_build| {
-                let s = fs::read_to_string(path).unwrap();
+            .lrpar_config(|mut cp_build| {
+                let s = fs::read_to_string(path.as_ref()).unwrap();
                 let docs = YamlLoader::load_from_str(&s).unwrap();
                 let mut outp = PathBuf::from(&out_dir);
                 outp.push(format!("{}.y.rs", base));

lrpar/cttests/src/lib.rs

@@ -3,7 +3,7 @@ use cfgrammar::Span;
 
 mod cgen_helper;
 #[allow(unused)]
-use cgen_helper::{leaked_path, run_test_path};
+use cgen_helper::run_test_path;
 
 mod calc_wasm;
 

lrpar/cttests_macro/src/lib.rs

@@ -34,7 +34,7 @@ pub fn generate_codegen_fail_tests(item: TokenStream) -> TokenStream {
             #[should_panic]
             #[test]
             fn #ident(){
-                run_test_path(leaked_path(#path)).unwrap();
+                run_test_path(#path).unwrap();
             }
         });
     }