Reduce indents w. let Some(..)

Author: mlund

src/icotable.rs

@@ -426,23 +426,24 @@ impl Table6D {
         writeln!(stream, "# r 𝜔 𝜃1 𝜑1 𝜃2 𝜑2 data")?;
         for (omega, angles) in self.get(r)?.iter() {
             for (vertex1, vertex2, data) in angles.flat_iter() {
-                if let Some(data) = data.get() {
-                    let (s1, s2) = (
-                        SphericalCoord::from_cartesian(vertex1.normalize()),
-                        SphericalCoord::from_cartesian(vertex2.normalize()),
-                    );
-                    writeln!(
-                        stream,
-                        "{:.2} {:.3} {:.3} {:.3} {:.3} {:.3} {:.4e}",
-                        r,
-                        omega,
-                        s1.theta(),
-                        s1.phi(),
-                        s2.theta(),
-                        s2.phi(),
-                        data
-                    )?;
-                }
+                let Some(data) = data.get() else {
+                    continue; // skip uninitialized data
+                };
+                let (s1, s2) = (
+                    SphericalCoord::from_cartesian(vertex1.normalize()),
+                    SphericalCoord::from_cartesian(vertex2.normalize()),
+                );
+                writeln!(
+                    stream,
+                    "{:.2} {:.3} {:.3} {:.3} {:.3} {:.3} {:.4e}",
+                    r,
+                    omega,
+                    s1.theta(),
+                    s1.phi(),
+                    s2.theta(),
+                    s2.phi(),
+                    data
+                )?;
             }
         }
         Ok(())

src/structure.rs

@@ -13,7 +13,7 @@
 // limitations under the license.
 
 use crate::Vector3;
-use anyhow::{bail, Context, Result};
+use anyhow::{anyhow, Context, Result};
 use faunus::topology::{AtomKind, FindByName};
 use itertools::Itertools;
 use nalgebra::Matrix3;
@@ -319,14 +319,14 @@ impl Display for Structure {
 
 /// Parse a single line from an XYZ file
 fn from_xyz_line(line: &str) -> Result<(String, Vector3)> {
-    if let Some([name, x, y, z]) = line.split_whitespace().collect_array() {
-        Ok((
-            name.to_string(),
-            Vector3::new(x.parse()?, y.parse()?, z.parse()?),
-        ))
-    } else {
-        bail!("'name x y z' expected in XYZ record: {}", line);
-    }
+    let [name, x, y, z] = line
+        .split_whitespace()
+        .collect_array()
+        .ok_or_else(|| anyhow!("Invalid XYZ record: {}", line))?;
+    Ok((
+        name.to_string(),
+        Vector3::new(x.parse()?, y.parse()?, z.parse()?),
+    ))
 }
 
 /// Write single ATOM record in PQR file stream
@@ -357,18 +357,17 @@ pub struct AminoAcidModelRecord {
 
 impl AminoAcidModelRecord {
     pub fn from_line(line: &str) -> Result<Self> {
-        if let Some([name, _, x, y, z, charge, mass, radius]) =
-            line.split_whitespace().collect_array()
-        {
-            Ok(Self {
-                name: name.to_string(),
-                pos: Vector3::new(x.parse()?, y.parse()?, z.parse()?),
-                charge: charge.parse()?,
-                mass: mass.parse()?,
-                radius: radius.parse()?,
-            })
-        } else {
-            bail!("Invalid AAM record: {}", line);
-        }
+        let [name, _, x, y, z, charge, mass, radius] = line
+            .split_whitespace()
+            .collect_array()
+            .ok_or_else(|| anyhow!("Invalid AAM record: {}", line))?;
+
+        Ok(Self {
+            name: name.to_string(),
+            pos: Vector3::new(x.parse()?, y.parse()?, z.parse()?),
+            charge: charge.parse()?,
+            mass: mass.parse()?,
+            radius: radius.parse()?,
+        })
     }
 }