Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix compiler warnings for rustc 1.81 #575

Merged
merged 2 commits into from
Sep 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion examples/dynamic-objects/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ struct Cycler {
impl Object for Cycler {
fn call(self: &Arc<Self>, _state: &State, args: &[Value]) -> Result<Value, Error> {
// 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())
}
Expand Down
4 changes: 2 additions & 2 deletions minijinja-contrib/src/globals.rs
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ pub fn cycler(items: Vec<Value>) -> Result<Value, Error> {
) -> Result<Value, Error> {
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);
Expand Down Expand Up @@ -107,7 +107,7 @@ pub fn joiner(sep: Option<Value>) -> Value {
}

fn call(self: &Arc<Self>, _state: &State<'_, '_>, args: &[Value]) -> Result<Value, Error> {
from_args(args)?;
let () = from_args(args)?;
let used = self.used.swap(true, Ordering::Relaxed);
if used {
Ok(self.sep.clone())
Expand Down
30 changes: 15 additions & 15 deletions minijinja-contrib/src/pycompat.rs
Original file line number Diff line number Diff line change
Expand Up @@ -67,42 +67,42 @@ fn string_methods(value: &Value, method: &str, args: &[Value]) -> Result<Value,

match method {
"upper" => {
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)?;
Expand Down Expand Up @@ -138,7 +138,7 @@ fn string_methods(value: &Value, method: &str, args: &[Value]) -> Result<Value,
}))
}
"title" => {
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())))
Expand Down Expand Up @@ -169,7 +169,7 @@ fn string_methods(value: &Value, method: &str, args: &[Value]) -> Result<Value,
}
}
"capitalize" => {
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())))
Expand Down Expand Up @@ -280,7 +280,7 @@ fn map_methods(value: &Value, method: &str, args: &[Value]) -> Result<Value, Err

match method {
"keys" => {
from_args(args)?;
let () = from_args(args)?;
Ok(Value::make_object_iterable(obj.clone(), |obj| {
match obj.try_iter() {
Some(iter) => iter,
Expand All @@ -289,7 +289,7 @@ fn map_methods(value: &Value, method: &str, args: &[Value]) -> Result<Value, Err
}))
}
"values" => {
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)),
Expand All @@ -298,7 +298,7 @@ fn map_methods(value: &Value, method: &str, args: &[Value]) -> Result<Value, Err
}))
}
"items" => {
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]))),
Expand Down
2 changes: 1 addition & 1 deletion minijinja/tests/test_environment.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down