Fix some hlint warnings.

TokTok · Mar 8, 2020 · f80db2d · f80db2d
1 parent f949e2b
commit f80db2d
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 29 deletions.
diff --git a/.gitignore b/.gitignore
@@ -17,3 +17,4 @@ cabal.sandbox.config
 *.eventlog
 .stack-work/
 cabal.project.local
+stack.yaml.lock
diff --git a/.travis.yml b/.travis.yml
@@ -1,13 +1,14 @@
 ---
 language: generic
+os: linux
 
 cache:
   directories:
     - $HOME/.stack
 
 before_install:
   - export PATH=$HOME/.local/bin:$PATH
-  - travis_retry curl -L https://github.com/TokTok/hs-tools/releases/download/v0.1/hs-tools-v0.1.tar.gz | tar xz -C $HOME
+  - travis_retry curl -L https://github.com/TokTok/hs-tools/releases/download/v0.6/hs-tools-v0.6.tar.gz | tar xz -C $HOME
 
 script:
   - hlint .

diff --git a/appveyor.yml b/appveyor.yml
diff --git a/src/Data/MessagePack/Types/Class.hs b/src/Data/MessagePack/Types/Class.hs
@@ -1,11 +1,10 @@
-{-# LANGUAGE CPP                  #-}
-{-# LANGUAGE DefaultSignatures    #-}
-{-# LANGUAGE FlexibleContexts     #-}
-{-# LANGUAGE FlexibleInstances    #-}
-{-# LANGUAGE IncoherentInstances  #-}
-{-# LANGUAGE LambdaCase           #-}
-{-# LANGUAGE Trustworthy          #-}
-{-# LANGUAGE TypeSynonymInstances #-}
+{-# LANGUAGE CPP                 #-}
+{-# LANGUAGE DefaultSignatures   #-}
+{-# LANGUAGE FlexibleContexts    #-}
+{-# LANGUAGE FlexibleInstances   #-}
+{-# LANGUAGE IncoherentInstances #-}
+{-# LANGUAGE LambdaCase          #-}
+{-# LANGUAGE Trustworthy         #-}
 
 --------------------------------------------------------------------
 -- |

diff --git a/stack.yaml b/stack.yaml
@@ -1,3 +1,3 @@
 ---
 packages: [.]
-resolver: lts-6.27
+resolver: lts-14.27
diff --git a/test/Data/MessagePack/OptionSpec.hs b/test/Data/MessagePack/OptionSpec.hs
@@ -73,7 +73,7 @@ spec = do
 
     describe "empty" $
       it "is a failure" $
-        empty <|> O.Some "a" `shouldBe` O.Some "a"
+        empty' <|> O.Some "a" `shouldBe` O.Some "a"
 
   describe "MonadPlus" $ do
     it "chooses the left-most success" $ do
@@ -106,6 +106,9 @@ spec = do
     pure' :: a -> O.Option a
     pure' = pure
 
+    empty' :: O.Option a
+    empty' = empty
+
     --
     -- Applicative laws.
     --

diff --git a/test/Data/MessagePack/ResultSpec.hs b/test/Data/MessagePack/ResultSpec.hs
@@ -72,7 +72,7 @@ spec = do
 
     describe "empty" $
       it "is a failure" $
-        empty <|> R.Success "a" `shouldBe` R.Success "a"
+        empty' <|> R.Success "a" `shouldBe` R.Success "a"
 
   where
     --
@@ -92,6 +92,9 @@ spec = do
     pure' :: a -> R.Result a
     pure' = pure
 
+    empty' :: R.Result a
+    empty' = empty
+
     --
     -- Applicative laws.
     --