From fdac74820c6138ea809851f4859a8453483f95ad Mon Sep 17 00:00:00 2001
From: rhiannon morris <rhi@rhiannon.website>
Date: Fri, 27 May 2022 13:29:43 +0200
Subject: [PATCH] put the reason first in todoWith/skipWith

it means less messing around when adding/removing skipWith, and
todoWith is just changed for consistency
---
 TAP.idr | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/TAP.idr b/TAP.idr
index a83f976..483fd9b 100644
--- a/TAP.idr
+++ b/TAP.idr
@@ -99,11 +99,11 @@ export
 test : (ToInfo e, ToInfo a) => String -> Lazy (Either e a) -> Test
 test label val = testIO label $ MkEitherT $ lazyToIO val
 
-||| a todo with a reason given. the reason is the first argument, e.g.
+||| a todo with a reason given, e.g.
 ||| `todo "<reason>" "<label>"` prints as `ok 1 - <label>  # todo <reason>`
 export
-todoWith : String -> String -> Test
-todoWith reason label = One $ MakeTest label $ pure $ Todo reason
+todoWith : (reason, label : String) -> Test
+todoWith {reason, label} = One $ MakeTest label $ pure $ Todo reason
 
 ||| a todo with no reason listed
 export
@@ -111,14 +111,14 @@ todo : String -> Test
 todo = todoWith ""
 
 private
-makeSkip : String -> String -> Test
-makeSkip label reason = One $ MakeTest label $ pure $ Skip reason
+makeSkip : (reason, label : String) -> Test
+makeSkip {reason, label} = One $ MakeTest label $ pure $ Skip reason
 
 ||| skip a test, with the reason given. skipping a `Note` doesn't do anything
 export
 skipWith : String -> Test -> Test
-skipWith reason (One   t)   = makeSkip t.label reason
-skipWith reason (Group l _) = makeSkip l       reason
+skipWith reason (One   t)   = makeSkip {reason, label = t.label}
+skipWith reason (Group l _) = makeSkip {reason, label = l}
 skipWith _      (Note  n)   = Note n
 
 ||| skip a test with no reason listed