Remove const Template::Template

rinja/src/lib.rs

@@ -144,9 +144,6 @@ pub trait Template: fmt::Display + filters::FastWritable {
     /// [`render_into`]: Template::render_into
     /// [`write_into`]: Template::write_into
     const SIZE_HINT: usize;
-
-    /// The MIME type (Content-Type) of the data that gets rendered by this Template
-    const MIME_TYPE: &'static str;
 }
 
 impl<T: Template + ?Sized> Template for &T {
@@ -166,8 +163,6 @@ impl<T: Template + ?Sized> Template for &T {
     }
 
     const SIZE_HINT: usize = T::SIZE_HINT;
-
-    const MIME_TYPE: &'static str = T::MIME_TYPE;
 }
 
 /// Object-safe wrapper trait around [`Template`] implementers
@@ -185,9 +180,6 @@ pub trait DynTemplate {
 
     /// Provides a conservative estimate of the expanded length of the rendered template
     fn size_hint(&self) -> usize;
-
-    /// The MIME type (Content-Type) of the data that gets rendered by this Template
-    fn mime_type(&self) -> &'static str;
 }
 
 impl<T: Template> DynTemplate for T {
@@ -207,10 +199,6 @@ impl<T: Template> DynTemplate for T {
     fn size_hint(&self) -> usize {
         Self::SIZE_HINT
     }
-
-    fn mime_type(&self) -> &'static str {
-        Self::MIME_TYPE
-    }
 }
 
 impl fmt::Display for dyn DynTemplate {
@@ -261,8 +249,6 @@ mod tests {
             }
 
             const SIZE_HINT: usize = 4;
-
-            const MIME_TYPE: &'static str = "text/plain; charset=utf-8";
         }
 
         impl fmt::Display for Test {

rinja_derive/Cargo.toml

@@ -31,8 +31,6 @@ pulldown-cmark = { version = "0.12.0", optional = true, default-features = false
 serde = { version = "1.0", optional = true, features = ["derive"] }
 
 memchr = "2"
-mime = "0.3"
-mime_guess = "2"
 quote = { version = "1", default-features = false }
 rustc-hash = "2.0.0"
 syn = { version = "2.0.3", default-features = false, features = ["clone-impls", "derive", "parsing", "printing"] }

rinja_derive/src/generator.rs

@@ -201,9 +201,7 @@ impl<'a, 'h> Generator<'a, 'h> {
             "\
                 rinja::Result::Ok(())\
             }}\
-            const SIZE_HINT: rinja::helpers::core::primitive::usize = {size_hint}usize;\
+            const SIZE_HINT: rinja::helpers::core::primitive::usize = {size_hint}usize;",
-            const MIME_TYPE: &'static rinja::helpers::core::primitive::str = {:?};",
-            self.input.mime_type,
         ));
 
         buf.write('}');

rinja_derive/src/input.rs

@@ -6,7 +6,6 @@ use std::path::{Path, PathBuf};
 use std::str::FromStr;
 use std::sync::{Arc, OnceLock};
 
-use mime::Mime;
 use parser::node::Whitespace;
 use parser::{Node, Parsed};
 use proc_macro2::Span;
@@ -27,7 +26,6 @@ pub(crate) struct TemplateInput<'a> {
     pub(crate) block: Option<&'a str>,
     pub(crate) print: Print,
     pub(crate) escaper: &'a str,
-    pub(crate) mime_type: String,
     pub(crate) path: Arc<Path>,
     pub(crate) fields: Vec<String>,
 }
@@ -107,10 +105,6 @@ impl TemplateInput<'_> {
                 )
             })?;
 
-        let mime_type =
-            extension_to_mime_type(ext.as_deref().or_else(|| extension(&path)).unwrap_or("txt"))
-                .to_string();
-
         let empty_punctuated = Punctuated::new();
         let fields = match ast.data {
             syn::Data::Struct(ref struct_) => {
@@ -139,7 +133,6 @@ impl TemplateInput<'_> {
             block: block.as_deref(),
             print: *print,
             escaper,
-            mime_type,
             path,
             fields,
         })
@@ -491,7 +484,9 @@ fn collect_rinja_code_blocks(
     for e in Parser::new(&source) {
         match (in_rinja_code, e) {
             (false, Event::Start(Tag::CodeBlock(CodeBlockKind::Fenced(s)))) => {
-                if s.split(",").any(|s| JINJA_EXTENSIONS.contains(&s)) {
+                if s.split(",")
+                    .any(|s| JINJA_EXTENSIONS.contains(&s.trim_ascii()))
+                {
                     in_rinja_code = true;
                     had_rinja_code = true;
                 }
@@ -535,19 +530,6 @@ impl<I: Iterator, E> Iterator for ResultIter<I, E> {
 
 impl<I: FusedIterator, E> FusedIterator for ResultIter<I, E> {}
 
-fn extension(path: &Path) -> Option<&str> {
-    let ext = path.extension()?.to_str()?;
-    if JINJA_EXTENSIONS.contains(&ext) {
-        // an extension was found: file stem cannot be absent
-        Path::new(path.file_stem().unwrap())
-            .extension()
-            .and_then(|s| s.to_str())
-            .or(Some(ext))
-    } else {
-        Some(ext)
-    }
-}
-
 #[derive(Debug, Clone, Hash, PartialEq)]
 pub(crate) enum Source {
     Path(Arc<str>),
@@ -582,32 +564,6 @@ impl FromStr for Print {
     }
 }
 
-pub(crate) fn extension_to_mime_type(ext: &str) -> Mime {
-    let basic_type = mime_guess::from_ext(ext).first_or_octet_stream();
-    for (simple, utf_8) in &TEXT_TYPES {
-        if &basic_type == simple {
-            return utf_8.clone();
-        }
-    }
-    basic_type
-}
-
-const TEXT_TYPES: [(Mime, Mime); 7] = [
-    (mime::TEXT_PLAIN, mime::TEXT_PLAIN_UTF_8),
-    (mime::TEXT_HTML, mime::TEXT_HTML_UTF_8),
-    (mime::TEXT_CSS, mime::TEXT_CSS_UTF_8),
-    (mime::TEXT_CSV, mime::TEXT_CSV_UTF_8),
-    (
-        mime::TEXT_TAB_SEPARATED_VALUES,
-        mime::TEXT_TAB_SEPARATED_VALUES_UTF_8,
-    ),
-    (
-        mime::APPLICATION_JAVASCRIPT,
-        mime::APPLICATION_JAVASCRIPT_UTF_8,
-    ),
-    (mime::IMAGE_SVG, mime::IMAGE_SVG),
-];
-
 fn cyclic_graph_error(dependency_graph: &[(Arc<Path>, Arc<Path>)]) -> Result<(), CompileError> {
     Err(CompileError::no_file_info(
         format!(
@@ -908,62 +864,13 @@ const _: () = {
     }
 };
 
+#[cfg(feature = "code-in-doc")]
 const JINJA_EXTENSIONS: &[&str] = &["j2", "jinja", "jinja2", "rinja"];
 
-#[cfg(test)]
+#[test]
-mod tests {
+fn get_source() {
-    use super::*;
+    let path = Config::new("", None, None, None)
-
+        .and_then(|config| config.find_template("b.html", None, None))
-    #[test]
+        .unwrap();
-    fn test_ext() {
+    assert_eq!(get_template_source(&path, None).unwrap(), "bar".into());
-        assert_eq!(extension(Path::new("foo-bar.txt")), Some("txt"));
-        assert_eq!(extension(Path::new("foo-bar.html")), Some("html"));
-        assert_eq!(extension(Path::new("foo-bar.unknown")), Some("unknown"));
-        assert_eq!(extension(Path::new("foo-bar.svg")), Some("svg"));
-
-        assert_eq!(extension(Path::new("foo/bar/baz.txt")), Some("txt"));
-        assert_eq!(extension(Path::new("foo/bar/baz.html")), Some("html"));
-        assert_eq!(extension(Path::new("foo/bar/baz.unknown")), Some("unknown"));
-        assert_eq!(extension(Path::new("foo/bar/baz.svg")), Some("svg"));
-    }
-
-    #[test]
-    fn test_double_ext() {
-        assert_eq!(extension(Path::new("foo-bar.html.txt")), Some("txt"));
-        assert_eq!(extension(Path::new("foo-bar.txt.html")), Some("html"));
-        assert_eq!(extension(Path::new("foo-bar.txt.unknown")), Some("unknown"));
-
-        assert_eq!(extension(Path::new("foo/bar/baz.html.txt")), Some("txt"));
-        assert_eq!(extension(Path::new("foo/bar/baz.txt.html")), Some("html"));
-        assert_eq!(
-            extension(Path::new("foo/bar/baz.txt.unknown")),
-            Some("unknown")
-        );
-    }
-
-    #[test]
-    fn test_skip_jinja_ext() {
-        assert_eq!(extension(Path::new("foo-bar.html.j2")), Some("html"));
-        assert_eq!(extension(Path::new("foo-bar.html.jinja")), Some("html"));
-        assert_eq!(extension(Path::new("foo-bar.html.jinja2")), Some("html"));
-
-        assert_eq!(extension(Path::new("foo/bar/baz.txt.j2")), Some("txt"));
-        assert_eq!(extension(Path::new("foo/bar/baz.txt.jinja")), Some("txt"));
-        assert_eq!(extension(Path::new("foo/bar/baz.txt.jinja2")), Some("txt"));
-    }
-
-    #[test]
-    fn test_only_jinja_ext() {
-        assert_eq!(extension(Path::new("foo-bar.j2")), Some("j2"));
-        assert_eq!(extension(Path::new("foo-bar.jinja")), Some("jinja"));
-        assert_eq!(extension(Path::new("foo-bar.jinja2")), Some("jinja2"));
-    }
-
-    #[test]
-    fn get_source() {
-        let path = Config::new("", None, None, None)
-            .and_then(|config| config.find_template("b.html", None, None))
-            .unwrap();
-        assert_eq!(get_template_source(&path, None).unwrap(), "bar".into());
-    }
 }

rinja_derive/src/tests.rs

@@ -37,7 +37,6 @@ fn compare(jinja: &str, expected: &str, fields: &[(&str, &str)], size_hint: usiz
                     rinja::Result::Ok(())
                 }
                 const SIZE_HINT: rinja::helpers::core::primitive::usize = #size_hint;
-                const MIME_TYPE: &'static rinja::helpers::core::primitive::str = "text/plain; charset=utf-8";
             }
 
             /// Implement the [`format!()`][rinja::helpers::std::format] trait for [`Foo`]

rinja_derive_standalone/Cargo.toml

@@ -34,8 +34,6 @@ pulldown-cmark = { version = "0.12.0", optional = true, default-features = false
 serde = { version = "1.0", optional = true, features = ["derive"] }
 
 memchr = "2"
-mime = "0.3"
-mime_guess = "2"
 quote = { version = "1", default-features = false }
 rustc-hash = "2.0.0"
 syn = { version = "2.0.3", default-features = false, features = ["clone-impls", "derive", "parsing", "printing"] }