upgrade askama

Author: randomairborne

Cargo.lock

@@ -1,3 +1,4 @@
+#![allow(clippy::inline_always, clippy::unused_self)]
 use std::fmt::{Display, Formatter, Write};
 
 use askama::filters::{Escaper as _, Html};
@@ -44,7 +45,12 @@ impl<'a> Span<'a> {
     }
 }
 
+#[askama::filter_fn]
 pub fn mojang_colorize<T: Display>(s: T, _: &dyn askama::Values) -> askama::Result<String> {
+    mojang_colorize_i(s)
+}
+
+pub fn mojang_colorize_i<T: Display>(s: T) -> askama::Result<String> {
     let s = s.to_string();
     let mut output = String::new();
     let mut last_was_section = false;
@@ -94,8 +100,13 @@ pub fn mojang_colorize<T: Display>(s: T, _: &dyn askama::Values) -> askama::Resu
     Ok(output)
 }
 
-#[allow(clippy::unnecessary_wraps)]
+#[askama::filter_fn]
 pub fn api_color<T: Display>(s: T, _: &dyn askama::Values) -> askama::Result<&'static str> {
+    api_color_i(s)
+}
+
+#[allow(clippy::unnecessary_wraps)]
+pub fn api_color_i<T: Display>(s: T) -> askama::Result<&'static str> {
     Ok(match s.to_string().as_str() {
         "Operational" => "green",
         "PossibleProblems" => "yellow",
@@ -104,8 +115,13 @@ pub fn api_color<T: Display>(s: T, _: &dyn askama::Values) -> askama::Result<&'s
     })
 }
 
-#[allow(clippy::unnecessary_wraps)]
+#[askama::filter_fn]
 pub fn api_words<T: Display>(s: T, _: &dyn askama::Values) -> askama::Result<&'static str> {
+    api_words_i(s)
+}
+
+#[allow(clippy::unnecessary_wraps)]
+pub fn api_words_i<T: Display>(s: T) -> askama::Result<&'static str> {
     Ok(match s.to_string().as_str() {
         "Operational" => "OK",
         "PossibleProblems" => "Flaky",
@@ -116,23 +132,20 @@ pub fn api_words<T: Display>(s: T, _: &dyn askama::Values) -> askama::Result<&'s
 
 #[cfg(test)]
 mod tests {
-
-    use askama::NO_VALUES;
-
     use super::*;
     #[test]
     fn test_api_words() {
-        assert_eq!(api_words("Operational", NO_VALUES).unwrap(), "OK");
-        assert_eq!(api_words("PossibleProblems", NO_VALUES).unwrap(), "Flaky");
-        assert_eq!(api_words("DefiniteProblems", NO_VALUES).unwrap(), "Down");
-        assert_eq!(api_words("operational", NO_VALUES).unwrap(), "Unknown");
+        assert_eq!(api_words_i("Operational").unwrap(), "OK");
+        assert_eq!(api_words_i("PossibleProblems").unwrap(), "Flaky");
+        assert_eq!(api_words_i("DefiniteProblems").unwrap(), "Down");
+        assert_eq!(api_words_i("operational").unwrap(), "Unknown");
     }
     #[test]
     fn test_api_colors() {
-        assert_eq!(api_color("Operational", NO_VALUES).unwrap(), "green");
-        assert_eq!(api_color("PossibleProblems", NO_VALUES).unwrap(), "yellow");
-        assert_eq!(api_color("DefiniteProblems", NO_VALUES).unwrap(), "red");
-        assert_eq!(api_color("operational", NO_VALUES).unwrap(), "blue");
+        assert_eq!(api_color_i("Operational").unwrap(), "green");
+        assert_eq!(api_color_i("PossibleProblems").unwrap(), "yellow");
+        assert_eq!(api_color_i("DefiniteProblems").unwrap(), "red");
+        assert_eq!(api_color_i("operational").unwrap(), "blue");
     }
     #[test]
     fn test_span_no_color() {
@@ -180,39 +193,39 @@ mod tests {
     fn test_colorize_none() {
         let input = "No color codes";
         assert_eq!(
-            mojang_colorize(input, NO_VALUES).unwrap(),
+            mojang_colorize_i(input).unwrap(),
             "<span class=\"\">No color codes</span>"
         );
     }
     #[test]
     fn test_colorize_one_color() {
         let input = "§acolor a";
         assert_eq!(
-            mojang_colorize(input, NO_VALUES).unwrap(),
+            mojang_colorize_i(input).unwrap(),
             "<span class=\"motd-style-a \">color a</span>"
         );
     }
     #[test]
     fn test_colorize_color_immediate_change() {
         let input = "§a§bcolor b";
         assert_eq!(
-            mojang_colorize(input, NO_VALUES).unwrap(),
+            mojang_colorize_i(input).unwrap(),
             "<span class=\"motd-style-b \">color b</span>"
         );
     }
     #[test]
     fn test_colorize_color_reset() {
         let input = "§acolor a§rblank§bcolor b";
         assert_eq!(
-            mojang_colorize(input, NO_VALUES).unwrap(),
+            mojang_colorize_i(input).unwrap(),
             r#"<span class="motd-style-a ">color a</span><span class="">blank</span><span class="motd-style-b ">color b</span>"#
         );
     }
     #[test]
     fn test_colorize_additive() {
         let input = "§a§nunderlined";
         assert_eq!(
-            mojang_colorize(input, NO_VALUES).unwrap(),
+            mojang_colorize_i(input).unwrap(),
             r#"<span class="motd-style-a motd-style-n ">underlined</span>"#
         );
     }