We need syn/full

Author: Kijewski

askama/Cargo.toml

@@ -45,15 +45,14 @@ maintenance = { status = "actively-developed" }
 
 [features]
 default = ["config", "derive", "std", "urlencode"]
-full = ["default", "blocks", "code-in-doc", "serde_json"]
+full = ["default", "code-in-doc", "serde_json"]
 
 alloc = [
     "askama_macros?/alloc",
     "serde?/alloc",
     "serde_json?/alloc",
     "percent-encoding?/alloc",
 ]
-blocks = ["askama_macros?/blocks"]
 code-in-doc = ["askama_macros?/code-in-doc"]
 config = ["askama_macros?/config"]
 derive = ["dep:askama_macros", "dep:askama_macros"]

askama_derive/Cargo.toml

@@ -30,20 +30,18 @@ memchr = "2"
 proc-macro2 = { version = "1", default-features = false }
 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"] }
+syn = { version = "2.0.3", default-features = false, features = ["clone-impls", "derive", "full", "parsing", "printing"] }
 
 [dev-dependencies]
 console = "0.16.0"
 criterion = "0.7"
 prettyplease = "0.2.20"
 similar = "2.6.0"
-syn = { version = "2.0.3", features = ["full"] }
 
 [features]
 # Use every feature to aid testing. `askama_macros` will opt-out of default features.
 default = [
     "alloc",
-    "blocks",
     "code-in-doc",
     "config",
     "external-sources",
@@ -54,7 +52,6 @@ default = [
 ]
 
 alloc = []
-blocks = ["syn/full"]
 code-in-doc = ["dep:pulldown-cmark"]
 config = [
     "external-sources",

askama_derive/src/generator.rs

@@ -59,7 +59,6 @@ pub(crate) enum TmplKind<'a> {
     /// [`askama::helpers::EnumVariantTemplate`]
     Variant,
     /// Used in `blocks` implementation
-    #[allow(unused)]
     Block(&'a str),
 }
 
@@ -254,15 +253,13 @@ impl<'a, 'h> Generator<'a, 'h> {
             #size_hint_s
         } });
 
-        #[cfg(feature = "blocks")]
         for block in self.input.blocks {
             self.impl_block(buf, block)?;
         }
 
         Ok(size_hint)
     }
 
-    #[cfg(feature = "blocks")]
     fn impl_block(
         &self,
         buf: &mut Buffer,

askama_derive/src/input.rs

@@ -24,7 +24,6 @@ pub(crate) struct TemplateInput<'a> {
     pub(crate) source: &'a Source,
     pub(crate) source_span: SourceSpan,
     pub(crate) block: Option<(&'a str, Span)>,
-    #[cfg(feature = "blocks")]
     pub(crate) blocks: &'a [Block],
     pub(crate) print: Print,
     pub(crate) escaper: &'a str,
@@ -46,7 +45,6 @@ impl TemplateInput<'_> {
             template_span,
             source: (source, source_span),
             block,
-            #[cfg(feature = "blocks")]
             blocks,
             print,
             escaping,
@@ -142,7 +140,6 @@ impl TemplateInput<'_> {
             source,
             source_span: source_span.clone(),
             block: block.as_ref().map(|(block, span)| (block.as_str(), *span)),
-            #[cfg(feature = "blocks")]
             blocks: blocks.as_slice(),
             print: *print,
             escaper,
@@ -411,7 +408,6 @@ impl AnyTemplateArgs {
     }
 }
 
-#[cfg(feature = "blocks")]
 pub(crate) struct Block {
     pub(crate) name: String,
     pub(crate) span: Span,
@@ -421,7 +417,6 @@ pub(crate) struct TemplateArgs {
     template_span: Span,
     pub(crate) source: (Source, SourceSpan),
     block: Option<(String, Span)>,
-    #[cfg(feature = "blocks")]
     blocks: Vec<Block>,
     print: Print,
     escaping: Option<String>,
@@ -476,7 +471,6 @@ impl TemplateArgs {
                 }
             },
             block: args.block.map(|value| (value.value(), value.span())),
-            #[cfg(feature = "blocks")]
             blocks: args
                 .blocks
                 .unwrap_or_default()
@@ -503,7 +497,6 @@ impl TemplateArgs {
             template_span: Span::call_site(),
             source: (Source::Source("".into()), SourceSpan::empty()),
             block: None,
-            #[cfg(feature = "blocks")]
             blocks: vec![],
             print: Print::default(),
             escaping: None,
@@ -765,7 +758,6 @@ pub(crate) struct PartialTemplateArgs {
     pub(crate) config: Option<LitStr>,
     pub(crate) whitespace: Option<Whitespace>,
     pub(crate) crate_name: Option<ExprPath>,
-    #[cfg(feature = "blocks")]
     pub(crate) blocks: Option<Vec<LitStr>>,
 }
 
@@ -831,7 +823,6 @@ const _: () = {
             config: None,
             whitespace: None,
             crate_name: None,
-            #[cfg(feature = "blocks")]
             blocks: None,
         };
         let mut has_data = false;
@@ -886,30 +877,22 @@ const _: () = {
                     this.crate_name = Some(get_exprpath(ident, pair.value)?);
                     continue;
                 } else if ident == "blocks" {
-                    if !cfg!(feature = "blocks") {
-                        return Err(CompileError::no_file_info(
-                            "enable feature `blocks` to use `blocks` argument",
-                            Some(ident.span()),
-                        ));
-                    } else if is_enum_variant {
+                    if is_enum_variant {
                         return Err(CompileError::no_file_info(
                             "template attribute `blocks` can only be used on the `enum`, \
                             not its variants",
                             Some(ident.span()),
                         ));
                     }
-                    #[cfg(feature = "blocks")]
-                    {
-                        ensure_only_once(ident, &mut this.blocks)?;
-                        this.blocks = Some(
-                            get_exprarray(ident, pair.value)?
-                                .elems
-                                .into_iter()
-                                .map(|value| get_strlit(ident, get_lit(ident, value)?))
-                                .collect::<Result<_, _>>()?,
-                        );
-                        continue;
-                    }
+                    ensure_only_once(ident, &mut this.blocks)?;
+                    this.blocks = Some(
+                        get_exprarray(ident, pair.value)?
+                            .elems
+                            .into_iter()
+                            .map(|value| get_strlit(ident, get_lit(ident, value)?))
+                            .collect::<Result<_, _>>()?,
+                    );
+                    continue;
                 }
 
                 let value = get_lit(ident, pair.value)?;
@@ -1081,7 +1064,6 @@ const _: () = {
         }
     }
 
-    #[cfg(feature = "blocks")]
     fn get_exprarray(name: &Ident, mut expr: Expr) -> Result<syn::ExprArray, CompileError> {
         loop {
             match expr {

askama_macros/Cargo.toml

@@ -22,10 +22,9 @@ askama_derive = { package = "askama_derive", path = "../askama_derive", version
 
 [features]
 default = ["config", "derive", "std", "urlencode"]
-full = ["default", "blocks", "code-in-doc", "serde_json"]
+full = ["default", "code-in-doc", "serde_json"]
 
 alloc = ["askama_derive/alloc"]
-blocks = ["askama_derive/blocks"]
 code-in-doc = ["askama_derive/code-in-doc"]
 config = ["askama_derive/config"]
 nightly-spans = ["askama_derive/nightly-spans"]

book/src/features.md

@@ -92,20 +92,12 @@ The most useful catch-all feature for a quick start might be `"full"`,
 which enables all implemented features, i.e.:
 
 ```toml
-full = ["default", "blocks", "code-in-doc", "serde_json"]
+full = ["default", "code-in-doc", "serde_json"]
 ```
 
 In production or once your project is “maturing” you might want to manually opt-in to any needed
 features with a finer granularity instead of depending on `"full"`.
 
-### `"blocks"`
-
-<blockquote class="right" style="padding:0.5ex 1ex; margin:0 0 1ex 1ex; font-size:80%">
-enabled by <code>"full"</code>
-</blockquote>
-
-Enables using [the template attribute `blocks`](creating_templates.html#the-template-attribute).
-
 ### `"serde_json"`
 
 <blockquote class="right" style="padding:0.5ex 1ex; margin:0 0 1ex 1ex; font-size:80%">

testing/Cargo.toml

@@ -19,7 +19,7 @@ serde_json = { version = "1.0", optional = true }
 core = { package = "intentionally-empty", version = "1.0.0" }
 
 [dev-dependencies]
-askama = { path = "../askama", version = "0.14.0", features = ["blocks", "code-in-doc", "serde_json"] }
+askama = { path = "../askama", version = "0.14.0", features = ["code-in-doc", "serde_json"] }
 askama_parser = { path = "../askama_parser", version = "0.14.0" }
 
 assert_matches = "1.5.0"
@@ -28,8 +28,7 @@ pulldown-cmark = "0.13"
 trybuild = "1.0.100"
 
 [features]
-default = ["blocks", "code-in-doc", "serde_json"]
-blocks = ["askama/blocks"]
+default = ["code-in-doc", "serde_json"]
 code-in-doc = ["askama/code-in-doc"]
 nightly-spans = ["askama/nightly-spans"]
 serde_json = ["dep:serde_json", "askama/serde_json"]

testing/tests/blocks.rs

@@ -1,5 +1,3 @@
-#![cfg(feature = "blocks")]
-
 use std::fmt::Display;
 
 use askama::Template;