Merge pull request #184 from Kijewski/pr-filters

derive: clean up and simplify filter generation

.rustfmt.toml

@@ -5,7 +5,7 @@ newline_style = "Unix"
 normalize_comments = true
 unstable_features = true
 use_field_init_shorthand = true
-version = "Two"
+style_edition = "2024"
 
 ignore = [
     "testing/tests/hello.rs",

examples/actix-web-app/.rustfmt.toml

@@ -0,0 +1 @@
+../../.rustfmt.toml

examples/actix-web-app/Cargo.toml

@@ -1,3 +1,8 @@
+# In a real application you would not need this section. It is only used in here, so that this
+# example can have a more lenient MSRV (minimum supported rust version) than rinja as a whole.
+[workspace]
+members = ["."]
+
 [package]
 name = "actix-web-app"
 version = "0.3.4"
@@ -6,12 +11,12 @@ license = "MIT OR Apache-2.0"
 publish = false
 
 [dependencies]
+actix-web = { version = "4.8.0", default-features = false, features = ["macros"] }
 # This is an example application that uses both rinja as template engine,
 # and actix-web as your web-framework.
 # rinja_actix makes it easy to use rinja templates as `Responder` of an actix-web request.
 # The rendered template is simply the response of your handler!
 rinja_actix = { version = "0.3.4", path = "../../rinja_actix" }
-actix-web = { version = "4.8.0", default-features = false, features = ["macros"] }
 tokio = { version = "1.38.0", features = ["sync", "rt-multi-thread"] }
 
 # serde and strum are used to parse (deserialize) and generate (serialize) information
@@ -25,8 +30,3 @@ env_logger = "0.11.3"
 log = "0.4.22"
 pretty-error-debug = "0.3.0"
 thiserror = "1.0.61"
-
-# In a real application you would not need this section. It is only used in here, so that this
-# example can have a more lenient MSRV (minimum supported rust version) than rinja as a whole.
-[workspace]
-members = ["."]

examples/actix-web-app/_typos.toml

@@ -0,0 +1 @@
+../../_typos.toml

examples/actix-web-app/deny.toml

@@ -0,0 +1 @@
+../../deny.toml

examples/actix-web-app/src/main.rs

@@ -1,6 +1,6 @@
-use actix_web::http::{header, Method};
+use actix_web::http::{Method, header};
 use actix_web::{
-    get, middleware, web, App, HttpRequest, HttpResponse, HttpServer, Responder, Result,
+    App, HttpRequest, HttpResponse, HttpServer, Responder, Result, get, middleware, web,
 };
 use rinja_actix::Template;
 use serde::Deserialize;

examples/actix-web-app/tomlfmt.toml

@@ -0,0 +1 @@
+../../tomlfmt.toml

fuzzing/.rustfmt.toml

@@ -0,0 +1 @@
+../.rustfmt.toml

fuzzing/_typos.toml

@@ -0,0 +1 @@
+../_typos.toml

fuzzing/deny.toml

@@ -0,0 +1 @@
+../deny.toml

fuzzing/tomlfmt.toml

@@ -0,0 +1 @@
+../tomlfmt.toml

rinja/benches/escape.rs

@@ -1,5 +1,5 @@
-use criterion::{black_box, criterion_group, criterion_main, Criterion};
-use rinja::filters::{escape, Html};
+use criterion::{Criterion, black_box, criterion_group, criterion_main};
+use rinja::filters::{Html, escape};
 
 criterion_main!(benches);
 criterion_group!(benches, functions);

rinja/benches/to-json.rs

@@ -1,4 +1,4 @@
-use criterion::{black_box, criterion_group, criterion_main, Criterion};
+use criterion::{Criterion, black_box, criterion_group, criterion_main};
 use rinja::Template;
 
 criterion_main!(benches);

rinja/src/filters/builtin.rs

@@ -2,142 +2,12 @@ use std::cell::Cell;
 use std::convert::Infallible;
 use std::fmt::{self, Write};
 
-#[cfg(feature = "humansize")]
-use humansize::{ISizeFormatter, ToF64, DECIMAL};
-#[cfg(feature = "num-traits")]
-use num_traits::{cast::NumCast, Signed};
-#[cfg(feature = "urlencode")]
-use percent_encoding::{utf8_percent_encode, AsciiSet, NON_ALPHANUMERIC};
-
 use super::escape::{FastWritable, HtmlSafeOutput};
 use crate::{Error, Result};
 
-#[cfg(feature = "urlencode")]
-// Urlencode char encoding set. Only the characters in the unreserved set don't
-// have any special purpose in any part of a URI and can be safely left
-// unencoded as specified in https://tools.ietf.org/html/rfc3986.html#section-2.3
-const URLENCODE_STRICT_SET: &AsciiSet = &NON_ALPHANUMERIC
-    .remove(b'_')
-    .remove(b'.')
-    .remove(b'-')
-    .remove(b'~');
-
-#[cfg(feature = "urlencode")]
-// Same as URLENCODE_STRICT_SET, but preserves forward slashes for encoding paths
-const URLENCODE_SET: &AsciiSet = &URLENCODE_STRICT_SET.remove(b'/');
-
 // MAX_LEN is maximum allowed length for filters.
 const MAX_LEN: usize = 10_000;
 
-#[cfg(feature = "humansize")]
-/// Returns adequate string representation (in KB, ..) of number of bytes
-///
-/// ## Example
-/// ```
-/// # use rinja::Template;
-/// #[derive(Template)]
-/// #[template(
-///     source = "Filesize: {{ size_in_bytes|filesizeformat }}.",
-///     ext = "html"
-/// )]
-/// struct Example {
-///     size_in_bytes: u64,
-/// }
-///
-/// let tmpl = Example { size_in_bytes: 1_234_567 };
-/// assert_eq!(tmpl.to_string(),  "Filesize: 1.23 MB.");
-/// ```
-#[inline]
-pub fn filesizeformat(b: &impl ToF64) -> Result<FilesizeFormatFilter, Infallible> {
-    Ok(FilesizeFormatFilter(b.to_f64()))
-}
-
-#[cfg(feature = "humansize")]
-#[derive(Debug, Clone, Copy)]
-pub struct FilesizeFormatFilter(f64);
-
-#[cfg(feature = "humansize")]
-impl fmt::Display for FilesizeFormatFilter {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.write_fmt(format_args!("{}", ISizeFormatter::new(self.0, &DECIMAL)))
-    }
-}
-
-#[cfg(feature = "urlencode")]
-/// Percent-encodes the argument for safe use in URI; does not encode `/`.
-///
-/// This should be safe for all parts of URI (paths segments, query keys, query
-/// values). In the rare case that the server can't deal with forward slashes in
-/// the query string, use [`urlencode_strict`], which encodes them as well.
-///
-/// Encodes all characters except ASCII letters, digits, and `_.-~/`. In other
-/// words, encodes all characters which are not in the unreserved set,
-/// as specified by [RFC3986](https://tools.ietf.org/html/rfc3986#section-2.3),
-/// with the exception of `/`.
-///
-/// ```none,ignore
-/// <a href="/metro{{ "/stations/Château d'Eau"|urlencode }}">Station</a>
-/// <a href="/page?text={{ "look, unicode/emojis ✨"|urlencode }}">Page</a>
-/// ```
-///
-/// To encode `/` as well, see [`urlencode_strict`](./fn.urlencode_strict.html).
-///
-/// [`urlencode_strict`]: ./fn.urlencode_strict.html
-#[inline]
-pub fn urlencode<T>(s: T) -> Result<HtmlSafeOutput<UrlencodeFilter<T>>, Infallible> {
-    Ok(HtmlSafeOutput(UrlencodeFilter(s, URLENCODE_SET)))
-}
-
-#[cfg(feature = "urlencode")]
-/// Percent-encodes the argument for safe use in URI; encodes `/`.
-///
-/// Use this filter for encoding query keys and values in the rare case that
-/// the server can't process them unencoded.
-///
-/// Encodes all characters except ASCII letters, digits, and `_.-~`. In other
-/// words, encodes all characters which are not in the unreserved set,
-/// as specified by [RFC3986](https://tools.ietf.org/html/rfc3986#section-2.3).
-///
-/// ```none,ignore
-/// <a href="/page?text={{ "look, unicode/emojis ✨"|urlencode_strict }}">Page</a>
-/// ```
-///
-/// If you want to preserve `/`, see [`urlencode`](./fn.urlencode.html).
-#[inline]
-pub fn urlencode_strict<T>(s: T) -> Result<HtmlSafeOutput<UrlencodeFilter<T>>, Infallible> {
-    Ok(HtmlSafeOutput(UrlencodeFilter(s, URLENCODE_STRICT_SET)))
-}
-
-#[cfg(feature = "urlencode")]
-pub struct UrlencodeFilter<T>(pub T, pub &'static AsciiSet);
-
-#[cfg(feature = "urlencode")]
-impl<T: fmt::Display> fmt::Display for UrlencodeFilter<T> {
-    #[inline]
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(UrlencodeWriter(f, self.1), "{}", self.0)
-    }
-}
-
-#[cfg(feature = "urlencode")]
-impl<T: FastWritable> FastWritable for UrlencodeFilter<T> {
-    #[inline]
-    fn write_into<W: fmt::Write + ?Sized>(&self, f: &mut W) -> fmt::Result {
-        self.0.write_into(&mut UrlencodeWriter(f, self.1))
-    }
-}
-
-#[cfg(feature = "urlencode")]
-struct UrlencodeWriter<W>(W, &'static AsciiSet);
-
-#[cfg(feature = "urlencode")]
-impl<W: fmt::Write> fmt::Write for UrlencodeWriter<W> {
-    #[inline]
-    fn write_str(&mut self, s: &str) -> fmt::Result {
-        write!(self.0, "{}", utf8_percent_encode(s, self.1))
-    }
-}
-
 /// Formats arguments according to the specified format
 ///
 /// The *second* argument to this filter must be a string literal (as in normal
@@ -381,24 +251,6 @@ pub fn indent(s: impl fmt::Display, width: usize) -> Result<String, fmt::Error>
     indent(try_to_string(s)?, width)
 }
 
-#[cfg(feature = "num-traits")]
-/// Casts number to f64
-pub fn into_f64<T>(number: T) -> Result<f64>
-where
-    T: NumCast,
-{
-    number.to_f64().ok_or(Error::Fmt)
-}
-
-#[cfg(feature = "num-traits")]
-/// Casts number to isize
-pub fn into_isize<T>(number: T) -> Result<isize>
-where
-    T: NumCast,
-{
-    number.to_isize().ok_or(Error::Fmt)
-}
-
 /// Joins iterable into a string separated by provided argument
 #[inline]
 pub fn join<I, S>(input: I, separator: S) -> Result<JoinFilter<I, S>, Infallible>
@@ -444,15 +296,6 @@ where
     }
 }
 
-#[cfg(feature = "num-traits")]
-/// Absolute value
-pub fn abs<T>(number: T) -> Result<T>
-where
-    T: Signed,
-{
-    Ok(number.abs())
-}
-
 /// Capitalize a value. The first character will be uppercase, all others lowercase.
 #[inline]
 pub fn capitalize(s: impl fmt::Display) -> Result<String, fmt::Error> {
@@ -772,62 +615,6 @@ fn try_to_string(s: impl fmt::Display) -> Result<String, fmt::Error> {
 mod tests {
     use super::*;
 
-    #[cfg(feature = "humansize")]
-    #[test]
-    fn test_filesizeformat() {
-        assert_eq!(filesizeformat(&0).unwrap().to_string(), "0 B");
-        assert_eq!(filesizeformat(&999u64).unwrap().to_string(), "999 B");
-        assert_eq!(filesizeformat(&1000i32).unwrap().to_string(), "1 kB");
-        assert_eq!(filesizeformat(&1023).unwrap().to_string(), "1.02 kB");
-        assert_eq!(filesizeformat(&1024usize).unwrap().to_string(), "1.02 kB");
-    }
-
-    #[cfg(feature = "urlencode")]
-    #[test]
-    fn test_urlencoding() {
-        // Unreserved (https://tools.ietf.org/html/rfc3986.html#section-2.3)
-        // alpha / digit
-        assert_eq!(urlencode("AZaz09").unwrap().to_string(), "AZaz09");
-        assert_eq!(urlencode_strict("AZaz09").unwrap().to_string(), "AZaz09");
-        // other
-        assert_eq!(urlencode("_.-~").unwrap().to_string(), "_.-~");
-        assert_eq!(urlencode_strict("_.-~").unwrap().to_string(), "_.-~");
-
-        // Reserved (https://tools.ietf.org/html/rfc3986.html#section-2.2)
-        // gen-delims
-        assert_eq!(
-            urlencode(":/?#[]@").unwrap().to_string(),
-            "%3A/%3F%23%5B%5D%40"
-        );
-        assert_eq!(
-            urlencode_strict(":/?#[]@").unwrap().to_string(),
-            "%3A%2F%3F%23%5B%5D%40"
-        );
-        // sub-delims
-        assert_eq!(
-            urlencode("!$&'()*+,;=").unwrap().to_string(),
-            "%21%24%26%27%28%29%2A%2B%2C%3B%3D"
-        );
-        assert_eq!(
-            urlencode_strict("!$&'()*+,;=").unwrap().to_string(),
-            "%21%24%26%27%28%29%2A%2B%2C%3B%3D"
-        );
-
-        // Other
-        assert_eq!(
-            urlencode("žŠďŤňĚáÉóŮ").unwrap().to_string(),
-            "%C5%BE%C5%A0%C4%8F%C5%A4%C5%88%C4%9A%C3%A1%C3%89%C3%B3%C5%AE"
-        );
-        assert_eq!(
-            urlencode_strict("žŠďŤňĚáÉóŮ").unwrap().to_string(),
-            "%C5%BE%C5%A0%C4%8F%C5%A4%C5%88%C4%9A%C3%A1%C3%89%C3%B3%C5%AE"
-        );
-
-        // Ferris
-        assert_eq!(urlencode("🦀").unwrap().to_string(), "%F0%9F%A6%80");
-        assert_eq!(urlencode_strict("🦀").unwrap().to_string(), "%F0%9F%A6%80");
-    }
-
     #[test]
     fn test_linebreaks() {
         assert_eq!(
@@ -932,31 +719,6 @@ mod tests {
         );
     }
 
-    #[cfg(feature = "num-traits")]
-    #[test]
-    #[allow(clippy::float_cmp)]
-    fn test_into_f64() {
-        assert_eq!(into_f64(1).unwrap(), 1.0_f64);
-        assert_eq!(into_f64(1.9).unwrap(), 1.9_f64);
-        assert_eq!(into_f64(-1.9).unwrap(), -1.9_f64);
-        assert_eq!(into_f64(f32::INFINITY).unwrap(), f64::INFINITY);
-        assert_eq!(into_f64(-f32::INFINITY).unwrap(), -f64::INFINITY);
-    }
-
-    #[cfg(feature = "num-traits")]
-    #[test]
-    fn test_into_isize() {
-        assert_eq!(into_isize(1).unwrap(), 1_isize);
-        assert_eq!(into_isize(1.9).unwrap(), 1_isize);
-        assert_eq!(into_isize(-1.9).unwrap(), -1_isize);
-        assert_eq!(into_isize(1.5_f64).unwrap(), 1_isize);
-        assert_eq!(into_isize(-1.5_f64).unwrap(), -1_isize);
-        match into_isize(f64::INFINITY) {
-            Err(Error::Fmt) => {}
-            _ => panic!("Should return error of type Err(Error::Fmt)"),
-        };
-    }
-
     #[allow(clippy::needless_borrow)]
     #[test]
     fn test_join() {
@@ -992,18 +754,6 @@ mod tests {
         );
     }
 
-    #[cfg(feature = "num-traits")]
-    #[test]
-    #[allow(clippy::float_cmp)]
-    fn test_abs() {
-        assert_eq!(abs(1).unwrap(), 1);
-        assert_eq!(abs(-1).unwrap(), 1);
-        assert_eq!(abs(1.0).unwrap(), 1.0);
-        assert_eq!(abs(-1.0).unwrap(), 1.0);
-        assert_eq!(abs(1.0_f64).unwrap(), 1.0_f64);
-        assert_eq!(abs(-1.0_f64).unwrap(), 1.0_f64);
-    }
-
     #[test]
     fn test_capitalize() {
         assert_eq!(capitalize("foo").unwrap().to_string(), "Foo".to_string());