Use pull request #165 from @r-ml Thank you! This has been tested by myself, and a couple projects. Also cleaned up a few warnings.

vthg2themax · vthg2themax · commit e5223e9fa730 · 2025-08-14T08:24:26.000-04:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -8,3 +8,4 @@ members = [
 exclude = [
   "examples"
 ]
+resolver = "2"
diff --git a/README.md b/README.md
@@ -27,7 +27,7 @@ Dependencies:
 
 ```toml
 [dependencies]
-sailfish = "0.9.0"
+sailfish = "0.10.0"
 ```
 
 You can choose to use `TemplateSimple` to access fields directly:
diff --git a/docs/en/docs/installation.md b/docs/en/docs/installation.md
@@ -4,7 +4,7 @@ In order to use sailfish templates, you have add two dependencies in your `Cargo
 
 ``` toml
 [dependencies]
-sailfish = "0.9.1"
+sailfish = "0.10.0"
 ```
 
 ## Feature Flags
diff --git a/examples/Cargo.toml b/examples/Cargo.toml
@@ -1,8 +1,8 @@
 [package]
 name = "sailfish-examples"
-version = "0.9.1"
+version = "0.10.0"
 authors = ["Ryohei Machida <orcinus4627@gmail.com>"]
-edition = "2018"
+edition = "2024"
 publish = false
 
 [dependencies]
diff --git a/rustfmt.toml b/rustfmt.toml
@@ -1,6 +1,6 @@
 max_width = 90
 hard_tabs = false
 use_field_init_shorthand = true
-edition = "2021"
+edition = "2024"
 reorder_imports = true
 reorder_modules = true
diff --git a/sailfish-compiler/Cargo.toml b/sailfish-compiler/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sailfish-compiler"
-version = "0.9.1"
+version = "0.10.0"
 authors = ["Ryohei Machida <orcinus4627@gmail.com>"]
 description = "Simple, small, and extremely fast template engine for Rust"
 homepage = "https://github.com/rust-sailfish/sailfish"
@@ -10,7 +10,7 @@ keywords = ["markup", "template", "html"]
 categories = ["template-engine"]
 license = "MIT"
 workspace = ".."
-edition = "2018"
+edition = "2024"
 
 [lib]
 name = "sailfish_compiler"
diff --git a/sailfish-compiler/src/config.rs b/sailfish-compiler/src/config.rs
@@ -193,20 +193,23 @@ mod imp {
 
     #[cfg(test)]
     mod tests {
+
         use crate::config::imp::expand_env_vars;
         use std::env;
 
         #[test]
+        #[allow(unsafe_code)]
         fn expands_env_vars() {
-            env::set_var("TESTVAR", "/a/path");
+            unsafe { env::set_var("TESTVAR", "/a/path") };
             let input = "/path/to/${TESTVAR}Templates";
             let output = expand_env_vars(input).unwrap();
             assert_eq!(output, "/path/to//a/pathTemplates");
         }
 
         #[test]
+        #[allow(unsafe_code)]
         fn retains_case_sensitivity() {
-            env::set_var("tEstVar", "/a/path");
+            unsafe { env::set_var("tEstVar", "/a/path") };
             let input = "/path/${tEstVar}";
             let output = expand_env_vars(input).unwrap();
             assert_eq!(output, "/path//a/path");
diff --git a/sailfish-compiler/src/lib.rs b/sailfish-compiler/src/lib.rs
@@ -1,4 +1,4 @@
-#![forbid(unsafe_code)]
+#![cfg_attr(not(test), forbid(unsafe_code))]
 
 #[macro_use]
 mod error;
diff --git a/sailfish-compiler/src/optimizer.rs b/sailfish-compiler/src/optimizer.rs
@@ -237,7 +237,7 @@ fn get_rendertext_value(mac: &Macro) -> Option<String> {
 
 fn get_rendertext_value_from_stmt(stmt: &Stmt) -> Option<String> {
     let em = match stmt {
-        Stmt::Expr(Expr::Macro(ref mac), Some(_)) => mac,
+        Stmt::Expr(Expr::Macro(mac), Some(_)) => mac,
         _ => return None,
     };
 
diff --git a/sailfish-compiler/src/translator.rs b/sailfish-compiler/src/translator.rs
@@ -368,7 +368,6 @@ mod tests {
     use crate::parser::Parser;
 
     #[test]
-    #[ignore]
     fn translate() {
         let src = "<% pub fn sample() { %> <%% <%=//%>\n1%><% } %>";
         let lexer = Parser::new();
diff --git a/sailfish-macros/Cargo.toml b/sailfish-macros/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sailfish-macros"
-version = "0.9.1"
+version = "0.10.0"
 authors = ["Ryohei Machida <orcinus4627@gmail.com>"]
 description = "Simple, small, and extremely fast template engine for Rust"
 homepage = "https://github.com/rust-sailfish/sailfish"
@@ -10,7 +10,7 @@ keywords = ["markup", "template", "html"]
 categories = ["template-engine"]
 license = "MIT"
 workspace = ".."
-edition = "2018"
+edition = "2024"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -30,6 +30,6 @@ proc-macro2 = "1.0.56"
 
 [dependencies.sailfish-compiler]
 path = "../sailfish-compiler"
-version = "0.9.1"
+version = "0.10.0"
 default-features = false
 features = ["procmacro"]
diff --git a/sailfish-tests/integration-tests/Cargo.toml b/sailfish-tests/integration-tests/Cargo.toml
@@ -1,8 +1,8 @@
 [package]
 name = "integration-tests"
-version = "0.9.1"
+version = "0.10.0"
 authors = ["Ryohei Machida <orcinus4627@gmail.com>"]
-edition = "2018"
+edition = "2024"
 publish = false
 
 [dependencies]
diff --git a/sailfish-tests/integration-tests/tests/template.rs b/sailfish-tests/integration-tests/tests/template.rs
@@ -2,7 +2,8 @@ extern crate sailfish_macros;
 
 use integration_tests::assert_string_eq;
 use sailfish::runtime::RenderResult;
-use sailfish::{Template, TemplateMut, TemplateOnce, TemplateSimple};
+use sailfish::{Template, TemplateMut, TemplateOnce};
+//use sailfish::TemplateSimple;
 use std::path::PathBuf;
 
 fn assert_render_result(name: &str, result: RenderResult) {
@@ -39,16 +40,16 @@ fn assert_render<T: Template>(name: &str, mut template: T) {
     assert_render_result(name, template.render_once());
 }
 
-trait ConflictWithSailFishRender {
-    fn render() {}
-}
+// trait ConflictWithSailFishRender {
+//     fn render() {}
+// }
 
-impl ConflictWithSailFishRender for u8 {}
-impl ConflictWithSailFishRender for u16 {}
+// impl ConflictWithSailFishRender for u8 {}
+// impl ConflictWithSailFishRender for u16 {}
 
-#[derive(TemplateSimple)]
-#[template(path = "empty.stpl")]
-struct EmptySimple {}
+// #[derive(TemplateSimple)]
+// #[template(path = "empty.stpl")]
+// struct EmptySimple {}
 
 #[test]
 fn empty_simple() {
diff --git a/sailfish-tests/integration-tests/tests/template_simple.rs b/sailfish-tests/integration-tests/tests/template_simple.rs
@@ -25,12 +25,12 @@ fn assert_render_result(name: &str, result: RenderResult) {
 fn assert_render_simple<T: TemplateSimple>(name: &str, template: T) {
     assert_render_result(name, template.render_once());
 }
-trait ConflictWithSailFishRender {
-    fn render() {}
-}
+// trait ConflictWithSailFishRender {
+//     fn render() {}
+// }
 
-impl ConflictWithSailFishRender for u8 {}
-impl ConflictWithSailFishRender for u16 {}
+// impl ConflictWithSailFishRender for u8 {}
+// impl ConflictWithSailFishRender for u16 {}
 
 #[derive(TemplateSimple)]
 #[template(path = "empty.stpl")]
diff --git a/sailfish/Cargo.toml b/sailfish/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sailfish"
-version = "0.9.1"
+version = "0.10.0"
 authors = ["Ryohei Machida <orcinus4627@gmail.com>"]
 description = "Simple, small, and extremely fast template engine for Rust"
 homepage = "https://github.com/rust-sailfish/sailfish"
@@ -10,7 +10,7 @@ keywords = ["markup", "template", "html"]
 categories = ["template-engine"]
 license = "MIT"
 workspace = ".."
-edition = "2018"
+edition = "2024"
 
 [features]
 default = ["config", "derive", "perf-inline"]
@@ -31,13 +31,16 @@ serde_json = { version = "1.0.95", optional = true }
 
 [dependencies.sailfish-macros]
 path = "../sailfish-macros"
-version = "0.9.1"
+version = "0.10.0"
 default-features = false
 optional = true
 
 [build-dependencies]
-version_check = "0.9.4"
+version_check = "0.9.5"
 
 [package.metadata.docs.rs]
 all-features = true
 rustdoc-args = ["--cfg", "docsrs"]
+
+[lints.rust]
+ unexpected_cfgs = { level = "warn", check-cfg = ['cfg(sailfish_nightly)'] }
diff --git a/sailfish/src/lib.rs b/sailfish/src/lib.rs
@@ -10,7 +10,8 @@
 //! if you want to render custom data inside templates, you must implement
 //! `runtime::Render` trait for that type.
 //!
-//! ```ignore
+//! ```compile_fail
+//! #[allow(rustdoc::invalid_rust_codeblocks)]
 //! use sailfish::Template;
 //!
 //! #[derive(Template)]
diff --git a/sailfish/src/runtime/buffer.rs b/sailfish/src/runtime/buffer.rs
@@ -201,7 +201,7 @@ fn safe_alloc(capacity: usize) -> *mut u8 {
 /// of memory pointed by `ptr`.
 #[cold]
 #[inline(never)]
-unsafe fn safe_realloc(ptr: *mut u8, capacity: usize, new_capacity: usize) -> *mut u8 {
+unsafe fn safe_realloc(ptr: *mut u8, capacity: usize, new_capacity: usize) -> *mut u8 { unsafe {
     assert!(new_capacity > 0);
     assert!(
         new_capacity <= std::isize::MAX as usize,
@@ -221,7 +221,7 @@ unsafe fn safe_realloc(ptr: *mut u8, capacity: usize, new_capacity: usize) -> *m
     }
 
     data
-}
+}}
 
 impl Clone for Buffer {
     fn clone(&self) -> Self {
diff --git a/sailfish/src/runtime/escape/avx2.rs b/sailfish/src/runtime/escape/avx2.rs
@@ -13,7 +13,7 @@ use super::{ESCAPED, ESCAPED_LEN, ESCAPE_LUT};
 const VECTOR_BYTES: usize = std::mem::size_of::<__m256i>();
 
 #[target_feature(enable = "avx2")]
-pub unsafe fn escape(feed: &str, buffer: &mut Buffer) {
+pub unsafe fn escape(feed: &str, buffer: &mut Buffer) { unsafe {
     debug_assert!(feed.len() >= 16);
 
     let len = feed.len();
@@ -92,11 +92,11 @@ pub unsafe fn escape(feed: &str, buffer: &mut Buffer) {
         let slc = slice::from_raw_parts(start_ptr, end_ptr as usize - start_ptr as usize);
         buffer.push_str(std::str::from_utf8_unchecked(slc));
     }
-}
+}}
 
 #[inline]
 #[target_feature(enable = "avx2")]
-unsafe fn escape_small(feed: &str, buffer: &mut Buffer) {
+unsafe fn escape_small(feed: &str, buffer: &mut Buffer) { unsafe {
     debug_assert!(feed.len() >= 16);
     debug_assert!(feed.len() < VECTOR_BYTES);
 
@@ -163,4 +163,4 @@ unsafe fn escape_small(feed: &str, buffer: &mut Buffer) {
         let slc = slice::from_raw_parts(start_ptr, end_ptr as usize - start_ptr as usize);
         buffer.push_str(std::str::from_utf8_unchecked(slc));
     }
-}
+}}
diff --git a/sailfish/src/runtime/escape/fallback.rs b/sailfish/src/runtime/escape/fallback.rs
@@ -39,7 +39,7 @@ fn contains_key(x: usize) -> bool {
 }
 
 #[inline]
-pub unsafe fn escape(feed: &str, buffer: &mut Buffer) {
+pub unsafe fn escape(feed: &str, buffer: &mut Buffer) { unsafe {
     debug_assert!(feed.len() >= 16);
 
     let len = feed.len();
@@ -70,4 +70,4 @@ pub unsafe fn escape(feed: &str, buffer: &mut Buffer) {
     debug_assert!(ptr <= end_ptr);
     debug_assert!(start_ptr <= ptr);
     naive::escape(buffer, start_ptr, ptr, end_ptr);
-}
+}}
diff --git a/sailfish/src/runtime/escape/naive.rs b/sailfish/src/runtime/escape/naive.rs
@@ -11,22 +11,22 @@ pub(super) unsafe fn escape(
     mut start_ptr: *const u8,
     ptr: *const u8,
     end_ptr: *const u8,
-) {
+) { unsafe {
     start_ptr = proceed(buffer, start_ptr, ptr, end_ptr);
 
     if likely!(end_ptr > start_ptr) {
         let slc = slice::from_raw_parts(start_ptr, end_ptr as usize - start_ptr as usize);
         buffer.push_str(std::str::from_utf8_unchecked(slc));
     }
-}
+}}
 
 #[inline]
 pub(super) unsafe fn proceed(
     buffer: &mut Buffer,
     mut start_ptr: *const u8,
     mut ptr: *const u8,
     end_ptr: *const u8,
-) -> *const u8 {
+) -> *const u8 { unsafe {
     while ptr < end_ptr {
         debug_assert!(start_ptr <= ptr);
         let idx = ESCAPE_LUT[*ptr as usize] as usize;
@@ -48,9 +48,9 @@ pub(super) unsafe fn proceed(
     debug_assert_eq!(ptr, end_ptr);
     debug_assert!(start_ptr <= ptr);
     start_ptr
-}
+}}
 
-pub(super) unsafe fn escape_small(feed: &str, mut buf: *mut u8) -> usize {
+pub(super) unsafe fn escape_small(feed: &str, mut buf: *mut u8) -> usize { unsafe {
     let mut start_ptr = feed.as_ptr();
     let mut ptr = start_ptr;
     let end_ptr = start_ptr.add(feed.len());
@@ -87,11 +87,11 @@ pub(super) unsafe fn escape_small(feed: &str, mut buf: *mut u8) -> usize {
     }
 
     buf as usize - buf_begin as usize
-}
+}}
 
 #[cfg(any(target_arch = "x86_64", target_arch = "x86", target_arch = "aarch64"))]
 #[inline]
-pub(super) unsafe fn push_escaped_str(value: &str, buffer: &mut Buffer) {
+pub(super) unsafe fn push_escaped_str(value: &str, buffer: &mut Buffer) { unsafe {
     buffer.reserve_small(value.len());
 
     let src = value.as_ptr();
@@ -105,7 +105,7 @@ pub(super) unsafe fn push_escaped_str(value: &str, buffer: &mut Buffer) {
     ptr::write_unaligned(dst as *mut u32, t1);
 
     buffer._set_len(buffer.len() + value.len());
-}
+}}
 
 #[cfg(not(any(target_arch = "x86_64", target_arch = "x86", target_arch = "aarch64")))]
 #[inline]
diff --git a/sailfish/src/runtime/escape/sse2.rs b/sailfish/src/runtime/escape/sse2.rs
@@ -13,7 +13,7 @@ use super::{ESCAPED, ESCAPED_LEN, ESCAPE_LUT};
 const VECTOR_BYTES: usize = std::mem::size_of::<__m128i>();
 
 #[target_feature(enable = "sse2")]
-pub unsafe fn escape(feed: &str, buffer: &mut Buffer) {
+pub unsafe fn escape(feed: &str, buffer: &mut Buffer) { unsafe {
     let len = feed.len();
     let mut start_ptr = feed.as_ptr();
     let mut ptr = start_ptr;
@@ -85,4 +85,4 @@ pub unsafe fn escape(feed: &str, buffer: &mut Buffer) {
         let slc = slice::from_raw_parts(start_ptr, end_ptr as usize - start_ptr as usize);
         buffer.push_str(std::str::from_utf8_unchecked(slc));
     }
-}
+}}
diff --git a/sailfish/src/runtime/filter.rs b/sailfish/src/runtime/filter.rs
diff --git a/sailfish/src/runtime/render.rs b/sailfish/src/runtime/render.rs
diff --git a/sailfish/src/runtime/utils.rs b/sailfish/src/runtime/utils.rs
diff --git a/scripts/bump-version.sh b/scripts/bump-version.sh
diff --git a/syntax/tree-sitter-sailfish/Cargo.toml b/syntax/tree-sitter-sailfish/Cargo.toml

Original file line number	Diff line number	Diff line change
`@@ -8,3 +8,4 @@ members = [`
`8`	`8`	`exclude = [`
`9`	`9`	`"examples"`
`10`	`10`	`]`
	`11`	`+resolver = "2"`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#![forbid(unsafe_code)]`
	`1`	`+#![cfg_attr(not(test), forbid(unsafe_code))]`
`2`	`2`
`3`	`3`	`#[macro_use]`
`4`	`4`	`mod error;`