hexagoxel
/
butcher
1
0
Fork 0
Code Issues 2 Pull Requests Packages Projects Releases Wiki Activity

Remove dependency on `either` package

pull/5/head
Lennart Spitzner 2017-12-10 23:23:59 +01:00
parent e8272f1804
commit dda70a959b
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
butcher.cabal
View File

@ -50,7 +50,6 @@ library
, multistate , multistate
, pretty , pretty
, containers , containers
, either
, transformers , transformers
, mtl , mtl
, extra , extra
@ -113,7 +112,6 @@ test-suite tests
, multistate , multistate
, pretty , pretty
, containers , containers
, either
, transformers , transformers
, mtl , mtl
, extra , extra

6
src-tests/TestMain.hs
View File

@ -31,7 +31,7 @@ checkTests = do
simpleParseTest :: Spec simpleParseTest :: Spec
simpleParseTest = do simpleParseTest = do
it "failed parse 001" $ runCmdParser Nothing (InputString "foo") testCmd1 it "failed parse 001" $ runCmdParser Nothing (InputString "foo") testCmd1
`shouldSatisfy` Data.Either.Combinators.isLeft . snd `shouldSatisfy` Data.Either.isLeft . snd
it "toplevel" $ (testParse testCmd1 "" >>= _cmd_out) it "toplevel" $ (testParse testCmd1 "" >>= _cmd_out)
`shouldSatisfy` Maybe.isNothing `shouldSatisfy` Maybe.isNothing
it "hasImpl 001" $ (testParse testCmd1 "abc" >>= _cmd_out) it "hasImpl 001" $ (testParse testCmd1 "abc" >>= _cmd_out)
@ -50,8 +50,8 @@ simpleRunTest = do
it "flag 2" $ testRun testCmd1 "abc --flong" `shouldBe` Right (Just 101) it "flag 2" $ testRun testCmd1 "abc --flong" `shouldBe` Right (Just 101)
it "flag 3" $ testRun testCmd1 "abc -f -f" `shouldBe` Right (Just 101) it "flag 3" $ testRun testCmd1 "abc -f -f" `shouldBe` Right (Just 101)
it "flag 4" $ testRun testCmd1 "abc -f -g" `shouldBe` Right (Just 103) it "flag 4" $ testRun testCmd1 "abc -f -g" `shouldBe` Right (Just 103)
it "flag 5" $ testRun testCmd1 "abc -f -g -f" `shouldSatisfy` Data.Either.Combinators.isLeft -- no reordering it "flag 5" $ testRun testCmd1 "abc -f -g -f" `shouldSatisfy` Data.Either.isLeft -- no reordering
it "flag 6" $ testRun testCmd1 "abc -g -f" `shouldSatisfy` Data.Either.Combinators.isLeft -- no reordering it "flag 6" $ testRun testCmd1 "abc -g -f" `shouldSatisfy` Data.Either.isLeft -- no reordering
it "flag 7" $ testRun testCmd1 "abc -g -g" `shouldBe` Right (Just 102) it "flag 7" $ testRun testCmd1 "abc -g -g" `shouldBe` Right (Just 102)
describe "with reordering" $ do describe "with reordering" $ do
it "cmd 1" $ testRun testCmd2 "abc" `shouldBe` Right (Just 100) it "cmd 1" $ testRun testCmd2 "abc" `shouldBe` Right (Just 100)

2
srcinc/prelude.inc
View File

@ -26,8 +26,6 @@ import qualified System.Info.Extra
import qualified System.Process.Extra import qualified System.Process.Extra
import qualified System.Time.Extra import qualified System.Time.Extra
import qualified Data.Either.Combinators
import qualified Control.Monad.Trans.MultiRWS.Lazy import qualified Control.Monad.Trans.MultiRWS.Lazy
import qualified Control.Monad.Trans.MultiRWS.Strict import qualified Control.Monad.Trans.MultiRWS.Strict
import qualified Control.Monad.Trans.MultiReader import qualified Control.Monad.Trans.MultiReader