git.iko.soy/stackage
on 1f69446 help sign in
stackage/patching/patches/tasty-0.3.patch
43 lines 1.5 kB history raw
1diff -ru orig/Test/Tasty/Options.hs new/Test/Tasty/Options.hs
2--- orig/Test/Tasty/Options.hs 2013-10-14 09:05:01.591238893 +0300
3+++ new/Test/Tasty/Options.hs 2013-10-14 09:05:01.000000000 +0300
4@@ -1,3 +1,4 @@
5+{-# LANGUAGE CPP #-}
6 {-# LANGUAGE ScopedTypeVariables, DeriveDataTypeable,
7 ExistentialQuantification, GADTs,
8 OverlappingInstances, FlexibleInstances, UndecidableInstances,
9@@ -27,6 +28,9 @@
10 import Data.Monoid
12 import Options.Applicative
13+#if MIN_VERSION_optparse_applicative(0,6,0)
14+import Options.Applicative.Types
15+#endif
17 -- | An option is a data type that inhabits the `IsOption` type class.
18 class Typeable v => IsOption v where
19@@ -60,7 +64,11 @@
20 name = untag (optionName :: Tagged v String)
21 helpString = untag (optionHelp :: Tagged v String)
22 parse =
23+#if MIN_VERSION_optparse_applicative(0,6,0)
24+ ReadM . maybe (Left (ErrorMsg $ "Could not parse " ++ name)) Right .
25+#else
26 maybe (Left (ErrorMsg $ "Could not parse " ++ name)) Right .
27+#endif
28 parseValue
31diff -ru orig/Test/Tasty/UI.hs new/Test/Tasty/UI.hs
32--- orig/Test/Tasty/UI.hs 2013-10-14 09:05:01.591238893 +0300
33+++ new/Test/Tasty/UI.hs 2013-10-14 09:05:01.000000000 +0300
34@@ -98,6 +98,9 @@
36 hSetBuffering stdout NoBuffering
38+ -- Do not retain the reference to the tree more than necessary
39+ _ <- evaluate alignment
41 st <-
42 flip execStateT initialState $ getApp $ fst $
43 foldTestTree