calm down clippy even more (#1997)

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();
             }
 

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");
     };
 

crates/typst-library/src/layout/table.rs

@@ -229,9 +229,7 @@ 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())
+    std::iter::once(Abs::zero()).chain(extents).map(move |extent| {
-        .chain(extents.into_iter())
-        .map(move |extent| {
         offset += extent;
         offset
     })

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)
+        let Some(font) = families(styles).find_map(|family| {
-            .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 {
-        else {
             bail!(self.span(), "current font does not support math");
         };
 

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;
             };
 

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 }) =
+    let Some(Spanned { v: path, span }) = args.named::<Spanned<EcoString>>("theme")?
-        args.named::<Spanned<EcoString>>("theme")?
     else {
         return Ok((None, None));
     };

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,
+            by_ref: None, mutability: None, ident, ..
-            mutability: None,
+        }) = &*typed.pat
-            ident,
+        else {
-            ..
-        }) = &*typed.pat else {
             bail!(typed.pat, "expected identifier");
         };