apply suggestion

argumentcomputer · Feb 14, 2024 · 60a5f2a · 60a5f2a
1 parent 80cd829
commit 60a5f2a
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 19 deletions.
diff --git a/src/cli/repl/meta_cmd.rs b/src/cli/repl/meta_cmd.rs
@@ -531,14 +531,14 @@ where
         }
         let open = repl.store.intern_lurk_symbol("open");
         let open_expr = repl.store.list(vec![open, repl.store.num(hash)]);
-        if let Some((args_vec, _)) = repl.store.fetch_list(&args) {
-            let mut expr_vec = Vec::with_capacity(args_vec.len() + 1);
-            expr_vec.push(open_expr);
-            expr_vec.extend(args_vec);
-            repl.handle_non_meta(repl.store.list(expr_vec))
-        } else {
-            Err(anyhow!("Data must have been interned"))
-        }
+        let Some((args_vec, _)) = repl.store.fetch_list(&args) else {
+            bail!("Data must have been interned");
+        };
+
+        let mut expr_vec = Vec::with_capacity(args_vec.len() + 1);
+        expr_vec.push(open_expr);
+        expr_vec.extend(args_vec);
+        repl.handle_non_meta(repl.store.list(expr_vec))
     }
 
     const CALL: MetaCmd<F, C> = MetaCmd {

diff --git a/src/cli/repl/mod.rs b/src/cli/repl/mod.rs
@@ -586,19 +586,19 @@ where
 
         let mut input = parser::Span::new(&input);
         loop {
-            if let Some(file_dir) = file_path.parent() {
-                match self.handle_form(input, file_dir, demo) {
-                    Ok(new_input) => input = new_input,
-                    Err(e) => {
-                        if let Some(parser::Error::NoInput) = e.downcast_ref::<parser::Error>() {
-                            // It's ok, it just means we've hit the EOF
-                            return Ok(());
-                        }
-                        return Err(e);
+            let Some(file_dir) = file_path.parent() else {
+                bail!("Can't load parent of {}", file_path);
+            };
+
+            match self.handle_form(input, file_dir, demo) {
+                Ok(new_input) => input = new_input,
+                Err(e) => {
+                    if let Some(parser::Error::NoInput) = e.downcast_ref::<parser::Error>() {
+                        // It's ok, it just means we've hit the EOF
+                        return Ok(());
                     }
+                    return Err(e);
                 }
-            } else {
-                return Err(anyhow!("Can't load parent of {}", file_path));
             }
         }
     }