summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMarek Barvíř <barvirm@gmail.com>2023-04-16 11:10:35 +0200
committerGitHub <noreply@github.com>2023-04-16 11:10:35 +0200
commitee32e7ad1ce26d4eebe601344e0343cfb9c8f9bd (patch)
treee704cd3c622acbf9faca558dd808f284a7df78f3 /src
parent261b96da68890dd1054efb76a72ee997cb779bae (diff)
Clippy fixes (#581)
Diffstat (limited to 'src')
-rw-r--r--src/eval/args.rs2
-rw-r--r--src/eval/mod.rs4
-rw-r--r--src/model/content.rs2
-rw-r--r--src/model/styles.rs8
4 files changed, 8 insertions, 8 deletions
diff --git a/src/eval/args.rs b/src/eval/args.rs
index 66ca4a85..aadd7d54 100644
--- a/src/eval/args.rs
+++ b/src/eval/args.rs
@@ -69,7 +69,7 @@ impl Args {
let vec = self.items.to_vec();
let (left, right) = vec.split_at(n);
self.items = right.into();
- return Ok(left.into());
+ Ok(left.into())
}
/// Consume and cast the first positional argument.
diff --git a/src/eval/mod.rs b/src/eval/mod.rs
index 1b3c6ea3..68d8148f 100644
--- a/src/eval/mod.rs
+++ b/src/eval/mod.rs
@@ -1203,7 +1203,7 @@ impl ast::Pattern {
return None;
};
if let Some(ident) = ident {
- vm.define(ident.clone(), sink.clone());
+ vm.define(ident.clone(), sink);
}
i += sink_size as i64;
Some(())
@@ -1217,7 +1217,7 @@ impl ast::Pattern {
}
}
}
- if i < value.len() as i64 {
+ if i < value.len() {
bail!(self.span(), "too many elements to destructure");
}
}
diff --git a/src/model/content.rs b/src/model/content.rs
index fa189b11..3f02369f 100644
--- a/src/model/content.rs
+++ b/src/model/content.rs
@@ -386,7 +386,7 @@ impl Content {
for attr in &self.attrs {
match attr {
Attr::Child(child) => child.query_into(introspector, selector, results),
- Attr::Value(value) => walk_value(introspector, &value, selector, results),
+ Attr::Value(value) => walk_value(introspector, value, selector, results),
_ => {}
}
}
diff --git a/src/model/styles.rs b/src/model/styles.rs
index 7fda52cf..8b7a829f 100644
--- a/src/model/styles.rs
+++ b/src/model/styles.rs
@@ -628,13 +628,13 @@ impl<'a> StyleChain<'a> {
) -> T::Output {
fn next<T: Fold>(
mut values: impl Iterator<Item = T>,
- styles: StyleChain,
+ _styles: StyleChain,
default: &impl Fn() -> T::Output,
) -> T::Output {
values
.next()
- .map(|value| value.fold(next(values, styles, default)))
- .unwrap_or_else(|| default())
+ .map(|value| value.fold(next(values, _styles, default)))
+ .unwrap_or_else(default)
}
next(self.properties::<T>(func, name, inherent), self, &default)
}
@@ -663,7 +663,7 @@ impl<'a> StyleChain<'a> {
values
.next()
.map(|value| value.resolve(styles).fold(next(values, styles, default)))
- .unwrap_or_else(|| default())
+ .unwrap_or_else(default)
}
next(self.properties::<T>(func, name, inherent), self, &default)
}