Minor adaptations

sharkdp · Jul 1, 2024 · 8abc7d4 · 8abc7d4
1 parent 25184c6
commit 8abc7d4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/numbat/src/ffi/lists.rs b/numbat/src/ffi/lists.rs
@@ -23,12 +23,10 @@ pub fn head(mut args: Args) -> Result<Value> {
 pub fn tail(mut args: Args) -> Result<Value> {
     let mut list = list_arg!(args);
 
-    if list.is_empty() {
-        Err(RuntimeError::EmptyList)
-    } else {
-        list.remove(0);
-
+    if list.remove(0).is_some() {
         return_list!(list)
+    } else {
+        Err(RuntimeError::EmptyList)
     }
 }
 

diff --git a/numbat/src/ffi/procedures.rs b/numbat/src/ffi/procedures.rs
@@ -46,13 +46,13 @@ pub(crate) fn procedures() -> &'static HashMap<ProcedureKind, ForeignFunction> {
     })
 }
 
-fn print(ctx: &mut ExecutionContext, args: Args) -> ControlFlow {
+fn print(ctx: &mut ExecutionContext, mut args: Args) -> ControlFlow {
     assert!(args.len() <= 1);
 
     if args.is_empty() {
         (ctx.print_fn)(&crate::markup::text(""))
     } else {
-        match &args[0] {
+        match arg!(args) {
             Value::String(string) => (ctx.print_fn)(&crate::markup::text(string)), // print string without quotes
             arg => (ctx.print_fn)(&arg.pretty_print()),
         }