Revert back to Visibility::PublicIn(String) cache a fn.

Author: ratmice

lrlex/src/lib/ctbuilder.rs

@@ -38,7 +38,7 @@ pub enum LexerKind {
 
 /// Specify the visibility of the module generated by [CTLexerBuilder].
 #[derive(Clone, PartialEq, Eq, Debug)]
-pub enum Visibility<'a> {
+pub enum Visibility {
     /// Module-level visibility only.
     Private,
     /// `pub`
@@ -50,10 +50,10 @@ pub enum Visibility<'a> {
     /// `pub(crate)`
     PublicCrate,
     /// `pub(in {arg})`
-    PublicIn(&'a str),
+    PublicIn(String),
 }
 
-impl ToTokens for Visibility<'_> {
+impl ToTokens for Visibility {
     fn to_tokens(&self, tokens: &mut TokenStream) {
         tokens.extend(match self {
             Visibility::Private => quote!(),
@@ -128,7 +128,7 @@ where
     output_path: Option<PathBuf>,
     lexerkind: LexerKind,
     mod_name: Option<&'a str>,
-    visibility: Visibility<'a>,
+    visibility: Visibility,
     rust_edition: RustEdition,
     rule_ids_map: Option<HashMap<String, LexerTypesT::StorageT>>,
     allow_missing_terms_in_lexer: bool,
@@ -297,7 +297,7 @@ where
     }
 
     /// Set the visibility of the generated module to `vis`. Defaults to `Visibility::Private`.
-    pub fn visibility(mut self, vis: Visibility<'a>) -> Self {
+    pub fn visibility(mut self, vis: Visibility) -> Self {
         self.visibility = vis;
         self
     }

lrpar/src/lib/ctbuilder.rs

@@ -92,6 +92,16 @@ impl<A: ToTokens, B: ToTokens> ToTokens for QuoteTuple<(A, B)> {
     }
 }
 
+/// The wrapped `&str` value will be emitted with a call to `to_string()`
+struct QuoteToString<'a>(&'a str);
+
+impl ToTokens for QuoteToString<'_> {
+    fn to_tokens(&self, tokens: &mut TokenStream) {
+        let x = &self.0;
+        tokens.append_all(quote! { #x.to_string() });
+    }
+}
+
 impl<StorageT> fmt::Display for CTConflictsError<StorageT>
 where
     StorageT: 'static + Debug + Hash + PrimInt + Unsigned,
@@ -149,7 +159,7 @@ impl Error for ErrorString {}
 
 /// Specify the visibility of the module generated by `CTBuilder`.
 #[derive(Clone, PartialEq, Eq, Debug)]
-pub enum Visibility<'a> {
+pub enum Visibility {
     /// Module-level visibility only.
     Private,
     /// `pub`
@@ -161,7 +171,7 @@ pub enum Visibility<'a> {
     /// `pub(crate)`
     PublicCrate,
     /// `pub(in {arg})`
-    PublicIn(&'a str),
+    PublicIn(String),
 }
 
 /// Specifies the [Rust Edition] that will be emitted during code generation.
@@ -174,7 +184,7 @@ pub enum RustEdition {
     Rust2021,
 }
 
-impl ToTokens for Visibility<'_> {
+impl ToTokens for Visibility {
     fn to_tokens(&self, tokens: &mut TokenStream) {
         tokens.extend(match self {
             Visibility::Private => quote!(),
@@ -190,17 +200,19 @@ impl ToTokens for Visibility<'_> {
     }
 }
 
-impl Visibility<'_> {
+impl Visibility {
     fn to_variant_tokens(&self, tokens: &mut TokenStream) {
         tokens.extend(match self {
-                Visibility::Private => quote!(::lrpar::Visibility::Private),
-                Visibility::Public => quote!(::lrpar::Visibility::Public),
-                Visibility::PublicSuper => quote!(::lrpar::Visibility::PublicSuper),
-                Visibility::PublicSelf => quote!(::lrpar::Visibility::PublicSelf),
-                Visibility::PublicCrate => quote!(::lrpar::Visibility::PublicCrate),
-                Visibility::PublicIn(data) => quote!(::lrpar::Visibility::PublicIn(#data)),
+            Visibility::Private => quote!(::lrpar::Visibility::Private),
+            Visibility::Public => quote!(::lrpar::Visibility::Public),
+            Visibility::PublicSuper => quote!(::lrpar::Visibility::PublicSuper),
+            Visibility::PublicSelf => quote!(::lrpar::Visibility::PublicSelf),
+            Visibility::PublicCrate => quote!(::lrpar::Visibility::PublicCrate),
+            Visibility::PublicIn(data) => {
+                let data = QuoteToString(data);
+                quote!(::lrpar::Visibility::PublicIn(#data))
             }
-        )
+        })
     }
 }
 
@@ -222,7 +234,7 @@ where
     error_on_conflicts: bool,
     warnings_are_errors: bool,
     show_warnings: bool,
-    visibility: Visibility<'a>,
+    visibility: Visibility,
     rust_edition: RustEdition,
     phantom: PhantomData<LexerTypesT>,
 }
@@ -353,7 +365,7 @@ where
     }
 
     /// Set the visibility of the generated module to `vis`. Defaults to `Visibility::Private`.
-    pub fn visibility(mut self, vis: Visibility<'a>) -> Self {
+    pub fn visibility(mut self, vis: Visibility) -> Self {
         self.visibility = vis;
         self
     }
@@ -811,17 +823,19 @@ where
         let cache_module = quote! {
             #[allow(unused)]
             mod _cache_information_ {
-                use ::lrpar::{RecoveryKind, Visibility};
+                use ::lrpar::{RecoveryKind, Visibility, RustEdition};
                 use ::cfgrammar::yacc::YaccKind;
 
                 const BUILD_TIME: &'static str = #build_time;
                 const GRAMMAR_PATH: &'static str = #grammar_path;
                 const MOD_NAME: Option<&'static str> = #mod_name;
                 const RECOVERER: RecoveryKind = #recoverer;
                 const YACC_KIND: YaccKind = #yacckind;
-                const VISIBILITY: Visibility = #visibility;
                 const ERROR_ON_CONFLICTS: bool = #error_on_conflicts;
                 const RULE_IDS_MAP: [(usize, &'static str); #rule_map_len] = [#(#rule_map,)*];
+                fn visibility() -> Visibility {
+                    #visibility
+                }
             }
         };
         cache_module.to_string()