summaryrefslogtreecommitdiff
path: root/library/src/layout
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 /library/src/layout
parent261b96da68890dd1054efb76a72ee997cb779bae (diff)
Clippy fixes (#581)
Diffstat (limited to 'library/src/layout')
-rw-r--r--library/src/layout/mod.rs4
-rw-r--r--library/src/layout/par.rs3
2 files changed, 4 insertions, 3 deletions
diff --git a/library/src/layout/mod.rs b/library/src/layout/mod.rs
index 0fed1a34..e84e35fc 100644
--- a/library/src/layout/mod.rs
+++ b/library/src/layout/mod.rs
@@ -238,7 +238,7 @@ impl<'a, 'v, 't> Builder<'a, 'v, 't> {
Self {
vt,
scratch,
- doc: top.then(|| DocBuilder::default()),
+ doc: top.then(DocBuilder::default),
flow: FlowBuilder::default(),
par: ParBuilder::default(),
list: ListBuilder::default(),
@@ -295,7 +295,7 @@ impl<'a, 'v, 't> Builder<'a, 'v, 't> {
.to::<PagebreakElem>()
.map_or(false, |pagebreak| !pagebreak.weak(styles));
- self.interrupt_page(keep.then(|| styles))?;
+ self.interrupt_page(keep.then_some(styles))?;
if let Some(doc) = &mut self.doc {
if doc.accept(content, styles) {
diff --git a/library/src/layout/par.rs b/library/src/layout/par.rs
index 011502e6..5d33de40 100644
--- a/library/src/layout/par.rs
+++ b/library/src/layout/par.rs
@@ -135,6 +135,7 @@ impl ParElem {
expand: bool,
) -> SourceResult<Fragment> {
#[comemo::memoize]
+ #[allow(clippy::too_many_arguments)]
fn cached(
par: &ParElem,
world: Tracked<dyn World>,
@@ -760,7 +761,7 @@ fn shared_get<T: PartialEq>(
.iter()
.filter_map(|child| child.to_styled())
.all(|(_, local)| getter(styles.chain(local)) == value)
- .then(|| value)
+ .then_some(value)
}
/// Find suitable linebreaks.