diff --git a/CHANGELOG.md b/CHANGELOG.md index 09ad0e8b..d3462437 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ All notable changes to MiniJinja are documented here. +## 2.3.1 + +- Fixes some compiler warnings in Rust 1.81. #575 + ## 2.3.0 - Fixes incorrect ordering of maps when the keys of those maps diff --git a/examples/dynamic-objects/src/main.rs b/examples/dynamic-objects/src/main.rs index ed808bfc..81495c0f 100644 --- a/examples/dynamic-objects/src/main.rs +++ b/examples/dynamic-objects/src/main.rs @@ -14,7 +14,7 @@ struct Cycler { impl Object for Cycler { fn call(self: &Arc, _state: &State, args: &[Value]) -> Result { // we don't want any args - from_args(args)?; + let () = from_args(args)?; let idx = self.idx.fetch_add(1, Ordering::Relaxed); Ok(self.values[idx % self.values.len()].clone()) } diff --git a/minijinja-contrib/src/globals.rs b/minijinja-contrib/src/globals.rs index d72c907b..ee5dea83 100644 --- a/minijinja-contrib/src/globals.rs +++ b/minijinja-contrib/src/globals.rs @@ -53,7 +53,7 @@ pub fn cycler(items: Vec) -> Result { ) -> Result { match method { "next" => { - from_args(args)?; + let () = from_args(args)?; let idx = self.pos.load(Ordering::Relaxed); self.pos .store((idx + 1) % self.items.len(), Ordering::Relaxed); @@ -107,7 +107,7 @@ pub fn joiner(sep: Option) -> Value { } fn call(self: &Arc, _state: &State<'_, '_>, args: &[Value]) -> Result { - from_args(args)?; + let () = from_args(args)?; let used = self.used.swap(true, Ordering::Relaxed); if used { Ok(self.sep.clone()) diff --git a/minijinja-contrib/src/pycompat.rs b/minijinja-contrib/src/pycompat.rs index 98d74726..76b63577 100644 --- a/minijinja-contrib/src/pycompat.rs +++ b/minijinja-contrib/src/pycompat.rs @@ -67,42 +67,42 @@ fn string_methods(value: &Value, method: &str, args: &[Value]) -> Result { - from_args(args)?; + let () = from_args(args)?; Ok(Value::from(s.to_uppercase())) } "lower" => { - from_args(args)?; + let () = from_args(args)?; Ok(Value::from(s.to_lowercase())) } "islower" => { - from_args(args)?; + let () = from_args(args)?; Ok(Value::from(s.chars().all(|x| x.is_lowercase()))) } "isupper" => { - from_args(args)?; + let () = from_args(args)?; Ok(Value::from(s.chars().all(|x| x.is_uppercase()))) } "isspace" => { - from_args(args)?; + let () = from_args(args)?; Ok(Value::from(s.chars().all(|x| x.is_whitespace()))) } "isdigit" | "isnumeric" => { // this is not a perfect mapping to what Python does, but // close enough for most uses in templates. - from_args(args)?; + let () = from_args(args)?; Ok(Value::from(s.chars().all(|x| x.is_numeric()))) } "isalnum" => { - from_args(args)?; + let () = from_args(args)?; Ok(Value::from(s.chars().all(|x| x.is_alphanumeric()))) } "isalpha" => { - from_args(args)?; + let () = from_args(args)?; Ok(Value::from(s.chars().all(|x| x.is_alphabetic()))) } "isascii" => { - from_args(args)?; - Ok(Value::from(s.chars().all(|x| x.is_ascii()))) + let () = from_args(args)?; + Ok(Value::from(s.is_ascii())) } "strip" => { let (chars,): (Option<&str>,) = from_args(args)?; @@ -138,7 +138,7 @@ fn string_methods(value: &Value, method: &str, args: &[Value]) -> Result { - from_args(args)?; + let () = from_args(args)?; // one shall not call into these filters. However we consider ourselves // privileged. Ok(Value::from(minijinja::filters::title(s.into()))) @@ -169,7 +169,7 @@ fn string_methods(value: &Value, method: &str, args: &[Value]) -> Result { - from_args(args)?; + let () = from_args(args)?; // one shall not call into these filters. However we consider ourselves // privileged. Ok(Value::from(minijinja::filters::capitalize(s.into()))) @@ -280,7 +280,7 @@ fn map_methods(value: &Value, method: &str, args: &[Value]) -> Result { - from_args(args)?; + let () = from_args(args)?; Ok(Value::make_object_iterable(obj.clone(), |obj| { match obj.try_iter() { Some(iter) => iter, @@ -289,7 +289,7 @@ fn map_methods(value: &Value, method: &str, args: &[Value]) -> Result { - from_args(args)?; + let () = from_args(args)?; Ok(Value::make_object_iterable(obj.clone(), |obj| { match obj.try_iter_pairs() { Some(iter) => Box::new(iter.map(|(_, v)| v)), @@ -298,7 +298,7 @@ fn map_methods(value: &Value, method: &str, args: &[Value]) -> Result { - from_args(args)?; + let () = from_args(args)?; Ok(Value::make_object_iterable(obj.clone(), |obj| { match obj.try_iter_pairs() { Some(iter) => Box::new(iter.map(|(k, v)| Value::from(vec![k, v]))), diff --git a/minijinja/tests/test_environment.rs b/minijinja/tests/test_environment.rs index 043b1198..ec9d32fd 100644 --- a/minijinja/tests/test_environment.rs +++ b/minijinja/tests/test_environment.rs @@ -160,7 +160,7 @@ fn test_unknown_method_callback() { let mut env = Environment::new(); env.set_unknown_method_callback(|_state, value, method, args| { if value.kind() == ValueKind::Map && method == "items" { - from_args(args)?; + from_args::<()>(args)?; minijinja::filters::items(value.clone()) } else { Err(Error::from(ErrorKind::UnknownMethod))