From ea469c2df6378e8ce860217cd100831ae6ee8d9f Mon Sep 17 00:00:00 2001
From: Beiri22 <beier1@hs-mittweida.de>
Date: Fri, 25 Aug 2023 14:27:50 +0200
Subject: [PATCH] calm down clippy even more (#1997)

---
 crates/typst-docs/src/html.rs            |  4 +++-
 crates/typst-library/src/compute/calc.rs |  2 +-
 crates/typst-library/src/layout/table.rs | 10 ++++------
 crates/typst-library/src/math/mod.rs     | 14 ++++++--------
 crates/typst-library/src/meta/outline.rs |  3 ++-
 crates/typst-library/src/text/raw.rs     |  3 +--
 crates/typst-macros/src/func.rs          |  8 +++-----
 crates/typst/src/eval/mod.rs             |  4 ++--
 8 files changed, 22 insertions(+), 26 deletions(-)

diff --git a/crates/typst-docs/src/html.rs b/crates/typst-docs/src/html.rs
index 4bb1def1..94f9e610 100644
--- a/crates/typst-docs/src/html.rs
+++ b/crates/typst-docs/src/html.rs
@@ -172,7 +172,9 @@ impl<'a> Handler<'a> {
             md::Event::Html(html) if html.starts_with("<contributors") => {
                 let from = html_attr(html, "from").unwrap();
                 let to = html_attr(html, "to").unwrap();
-                let Some(output) = contributors(self.resolver, from, to) else { return false };
+                let Some(output) = contributors(self.resolver, from, to) else {
+                    return false;
+                };
                 *html = output.raw.into();
             }
 
diff --git a/crates/typst-library/src/compute/calc.rs b/crates/typst-library/src/compute/calc.rs
index 81715007..ee4261af 100644
--- a/crates/typst-library/src/compute/calc.rs
+++ b/crates/typst-library/src/compute/calc.rs
@@ -859,7 +859,7 @@ fn minmax(
     goal: Ordering,
 ) -> SourceResult<Value> {
     let mut iter = values.into_iter();
-    let Some(Spanned { v: mut extremum, ..}) = iter.next() else {
+    let Some(Spanned { v: mut extremum, .. }) = iter.next() else {
         bail!(span, "expected at least one value");
     };
 
diff --git a/crates/typst-library/src/layout/table.rs b/crates/typst-library/src/layout/table.rs
index 2cbaa9c3..11f37b8a 100644
--- a/crates/typst-library/src/layout/table.rs
+++ b/crates/typst-library/src/layout/table.rs
@@ -229,12 +229,10 @@ impl Layout for TableElem {
 /// and after the extents, e.g. [10mm, 5mm] -> [0mm, 10mm, 15mm].
 fn points(extents: impl IntoIterator<Item = Abs>) -> impl Iterator<Item = Abs> {
     let mut offset = Abs::zero();
-    std::iter::once(Abs::zero())
-        .chain(extents.into_iter())
-        .map(move |extent| {
-            offset += extent;
-            offset
-        })
+    std::iter::once(Abs::zero()).chain(extents).map(move |extent| {
+        offset += extent;
+        offset
+    })
 }
 
 /// A value that can be configured per cell.
diff --git a/crates/typst-library/src/math/mod.rs b/crates/typst-library/src/math/mod.rs
index a2302785..f10850cf 100644
--- a/crates/typst-library/src/math/mod.rs
+++ b/crates/typst-library/src/math/mod.rs
@@ -249,14 +249,12 @@ impl Layout for EquationElem {
         // Find a math font.
         let variant = variant(styles);
         let world = vt.world;
-        let Some(font) = families(styles)
-            .find_map(|family| {
-                let id = world.book().select(family.as_str(), variant)?;
-                let font = world.font(id)?;
-                let _ = font.ttf().tables().math?.constants?;
-                Some(font)
-            })
-        else {
+        let Some(font) = families(styles).find_map(|family| {
+            let id = world.book().select(family.as_str(), variant)?;
+            let font = world.font(id)?;
+            let _ = font.ttf().tables().math?.constants?;
+            Some(font)
+        }) else {
             bail!(self.span(), "current font does not support math");
         };
 
diff --git a/crates/typst-library/src/meta/outline.rs b/crates/typst-library/src/meta/outline.rs
index 69d39bdf..47caa0b5 100644
--- a/crates/typst-library/src/meta/outline.rs
+++ b/crates/typst-library/src/meta/outline.rs
@@ -214,7 +214,8 @@ impl Show for OutlineElem {
                 self.span(),
                 elem.clone().into_inner(),
                 self.fill(styles),
-            )? else {
+            )?
+            else {
                 continue;
             };
 
diff --git a/crates/typst-library/src/text/raw.rs b/crates/typst-library/src/text/raw.rs
index face0aa0..eb21e016 100644
--- a/crates/typst-library/src/text/raw.rs
+++ b/crates/typst-library/src/text/raw.rs
@@ -515,8 +515,7 @@ fn parse_theme(
     vm: &mut Vm,
     args: &mut Args,
 ) -> SourceResult<(Option<EcoString>, Option<Bytes>)> {
-    let Some(Spanned { v: path, span }) =
-        args.named::<Spanned<EcoString>>("theme")?
+    let Some(Spanned { v: path, span }) = args.named::<Spanned<EcoString>>("theme")?
     else {
         return Ok((None, None));
     };
diff --git a/crates/typst-macros/src/func.rs b/crates/typst-macros/src/func.rs
index 77edff9a..13a6eb2d 100644
--- a/crates/typst-macros/src/func.rs
+++ b/crates/typst-macros/src/func.rs
@@ -53,11 +53,9 @@ fn prepare(stream: TokenStream, item: &syn::ItemFn) -> Result<Func> {
         };
 
         let syn::Pat::Ident(syn::PatIdent {
-            by_ref: None,
-            mutability: None,
-            ident,
-            ..
-        }) = &*typed.pat else {
+            by_ref: None, mutability: None, ident, ..
+        }) = &*typed.pat
+        else {
             bail!(typed.pat, "expected identifier");
         };
 
diff --git a/crates/typst/src/eval/mod.rs b/crates/typst/src/eval/mod.rs
index c446f7b1..4eb8d122 100644
--- a/crates/typst/src/eval/mod.rs
+++ b/crates/typst/src/eval/mod.rs
@@ -1371,8 +1371,8 @@ where
         match p {
             ast::DestructuringKind::Normal(expr) => {
                 let Ok(v) = value.at(i as i64, None) else {
-                        bail!(expr.span(), "not enough elements to destructure");
-                    };
+                    bail!(expr.span(), "not enough elements to destructure");
+                };
                 f(vm, expr, v)?;
                 i += 1;
             }