refactor: use Option::transpose

synacktiv · Nov 20, 2024 · bc55cb1 · bc55cb1
1 parent 4722239
commit bc55cb1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/strace/parser/mod.rs b/src/strace/parser/mod.rs
@@ -34,7 +34,7 @@ impl LogParser {
                 let file = File::options().create(true).append(true).open(p)?;
                 Ok(BufWriter::with_capacity(64 * 1024, file))
             })
-            .map_or(Ok(None), |v| v.map(Some))?;
+            .transpose()?;
         Ok(Self {
             reader,
             log,

diff --git a/src/strace/parser/peg.rs b/src/strace/parser/peg.rs
@@ -191,7 +191,7 @@ fn lit_pair(pair: Pair<Rule>) -> anyhow::Result<IntegerExpression> {
                 val_pair.as_str().parse()?,
                 metadata_pair
                     .map(|p| BufferExpression::try_from(p).map(|e| e.value))
-                    .map_or(Ok(None), |v| v.map(Some))?,
+                    .transpose()?,
             )
         }
         _ => anyhow::bail!("Unhandled pair: {pair:?}"),
@@ -221,7 +221,7 @@ impl TryFrom<Pair<'_, Rule>> for IntegerExpression {
                     value: IntegerExpressionValue::NamedConst(val_pair.as_str().to_owned()),
                     metadata: metadata_pair
                         .map(|p| BufferExpression::try_from(p).map(|e| e.value))
-                        .map_or(Ok(None), |v| v.map(Some))?,
+                        .transpose()?,
                 })
             }
             Rule::or => {