Merge branch 'master' into fix/clippy-pedantic-warnings

CHANGELOG.md

@@ -10,7 +10,12 @@ project adheres to
 
 ## Unreleased
 
+* Added a check that no more than one of the http-types, mime02, or
+  mime03 features are enabled (PR #124).  Thanks @rustafarian-dev.
+* Changed the writer type from `W: &mut Write` to just `W: Write` (PR #125).
+  Thanks @kornelski!
 * Fixed more clippy lint (PR #123).  Thanks @vbrandl!
+* Updated `rsass` to 0.28.0 and `itertools` to 0.11.0.
 
 
 ## Release 0.16.1 -- 2023-01-28

Cargo.toml

@@ -26,11 +26,11 @@ tide013 = ["http-types"]
 [dependencies]
 base64 = "0.21.0"
 bytecount = "0.6.0"
-itertools = "0.10.0"
+itertools = "0.11.0"
 md5 = "0.7"
 nom = "7.1.0"
 
-rsass = { version = "0.27.0", optional = true }
+rsass = { version = "0.28.0", optional = true }
 mime = { version = "0.3", optional = true }
 
 [badges]

src/staticfiles.rs

@@ -614,6 +614,15 @@ fn name_and_ext(path: &Path) -> Option<(&str, &str)> {
     None
 }
 
+#[cfg(any(
+    all(feature = "mime03", feature = "http-types"),
+    all(feature = "mime02", feature = "http-types"),
+    all(feature = "mime02", feature = "mime03"),
+))]
+compile_error!(
+    r#"Only one of these features "http-types", "mime02" or "mime03" must be enabled at a time."#
+);
+
 /// A short and url-safe checksum string from string data.
 fn checksum_slug(data: &[u8]) -> String {
     use base64::prelude::{Engine, BASE64_URL_SAFE_NO_PAD};

src/template.rs

@@ -41,8 +41,7 @@ impl Template {
         writeln!(
             out,
             "\n\
-             #[allow(clippy::used_underscore_binding)]\n\
-             pub fn {name}<{ta}{ta_sep}W>(_ructe_out_: &mut W{args}) -> io::Result<()>\n\
+             pub fn {name}<{ta}{ta_sep}W>(#[allow(unused_mut, clippy::used_underscore_binding)] mut _ructe_out_: W{args}) -> io::Result<()>\n\
              where W: Write {{\n\
              {body}\
              Ok(())\n\

src/templateexpression.rs

@@ -82,7 +82,7 @@ impl TemplateExpression {
                 format!("_ructe_out_.write_all({text:?}.as_bytes())?;\n")
             }
             TemplateExpression::Expression { ref expr } => {
-                format!("{expr}.to_html(_ructe_out_)?;\n")
+                format!("{expr}.to_html(_ructe_out_.by_ref())?;\n")
             }
             TemplateExpression::ForLoop {
                 ref name,
@@ -122,7 +122,7 @@ impl TemplateExpression {
             ),
             TemplateExpression::CallTemplate { ref name, ref args } => {
                 format!(
-                    "{name}(_ructe_out_{})?;\n",
+                    "{name}(_ructe_out_.by_ref(){})?;\n",
                     args.iter().format_with("", |arg, f| f(&format_args!(
                         ", {arg}"
                     ))),