Merge pull request #192 from Kijewski/pr-use-rinja

generator: better macro hygiene

deny.toml

@@ -1,6 +1,6 @@
 [licenses]
 version = 2
-allow = ["Apache-2.0", "BSD-2-Clause", "MIT", "Unicode-DFS-2016"]
+allow = ["Apache-2.0", "MIT", "MIT-0", "Unicode-DFS-2016"]
 private = { ignore = true }
 
 [[licenses.clarify]]

rinja/src/helpers.rs

@@ -1,9 +1,11 @@
-#![doc(hidden)]
-
 use std::cell::Cell;
 use std::fmt;
 use std::iter::{Enumerate, Peekable};
 
+// The re-exports are used in the generated code for macro hygiene. Even if the paths `::core` or
+// `::std` are shadowed, the generated code will still be able to access the crates.
+pub use {core, std};
+
 use crate::filters::FastWritable;
 
 pub struct TemplateLoop<I>

rinja/src/lib.rs

@@ -61,6 +61,7 @@
 
 mod error;
 pub mod filters;
+#[doc(hidden)]
 pub mod helpers;
 mod html;
 

rinja_derive/src/config.rs

@@ -12,7 +12,7 @@ use proc_macro2::Span;
 #[cfg(feature = "config")]
 use serde::Deserialize;
 
-use crate::{CRATE, CompileError, FileInfo, OnceMap};
+use crate::{CompileError, FileInfo, OnceMap};
 
 #[derive(Debug)]
 pub(crate) struct Config {
@@ -182,7 +182,7 @@ impl Config {
         for (extensions, name) in DEFAULT_ESCAPERS {
             escapers.push((
                 str_set(extensions),
-                format!("{CRATE}::filters::{name}").into(),
+                format!("rinja::filters::{name}").into(),
             ));
         }
 
@@ -682,11 +682,11 @@ mod tests {
                 str_set(&[
                     "html", "htm", "j2", "jinja", "jinja2", "rinja", "svg", "xml"
                 ]),
-                "::rinja::filters::Html".into()
+                "rinja::filters::Html".into()
             ),
             (
                 str_set(&["md", "none", "txt", "yml", ""]),
-                "::rinja::filters::Text".into()
+                "rinja::filters::Text".into()
             ),
         ]);
     }