Upgrade to resolver 20.11 (#1158)

* In each exercise, change resolver from 19.27 to 20.13
and configFastFail to configFailFast due to hspec 2.9.0

* configFastFail to configFailFast in TESTS.md

* 20.11 instead of 20.13

* fix ci (non-exhaustive pattern)

* resolver 20.18 instead of 20.11

* Fix CI

* Avoid deprecated function

* Hide non-exhaustive pattern match

* Avoid yet another non-exhaustive pattern match

---------

Co-authored-by: Matthijs Blom <[email protected]>

docs/TESTS.md

@@ -45,7 +45,7 @@ in an *import statement* in the test suite, usually at the beginning:
 
 ```haskell
 import Test.Hspec        (Spec, describe, it, shouldBe)
-import Test.Hspec.Runner (configFastFail, defaultConfig, hspecWith)
+import Test.Hspec.Runner (configFailFast, defaultConfig, hspecWith)
 
 import ModuleName (someFunc)
 

exercises/concept/guessing-game/stack.yaml

@@ -1 +1 @@
-resolver: lts-19.27
+resolver: lts-20.18

exercises/concept/lucians-luscious-lasagna/stack.yaml

@@ -1 +1 @@
-resolver: lts-19.27
+resolver: lts-20.18

exercises/concept/pacman-rules/stack.yaml

@@ -1 +1 @@
-resolver: lts-19.27
+resolver: lts-20.18

exercises/concept/temperature/stack.yaml

@@ -1 +1 @@
-resolver: lts-19.27
+resolver: lts-20.18

exercises/concept/valentines-day/stack.yaml

@@ -1 +1 @@
-resolver: lts-19.27
+resolver: lts-20.18

exercises/practice/accumulate/stack.yaml

@@ -1 +1 @@
-resolver: lts-19.27
+resolver: lts-20.18

exercises/practice/accumulate/test/Tests.hs

@@ -1,11 +1,11 @@
 import Data.Char         (toUpper)
 import Test.Hspec        (Spec, it, shouldBe)
-import Test.Hspec.Runner (configFastFail, defaultConfig, hspecWith)
+import Test.Hspec.Runner (configFailFast, defaultConfig, hspecWith)
 
 import Accumulate (accumulate)
 
 main :: IO ()
-main = hspecWith defaultConfig {configFastFail = True} specs
+main = hspecWith defaultConfig {configFailFast = True} specs
 
 specs :: Spec
 specs = do

exercises/practice/acronym/stack.yaml

@@ -1 +1 @@
-resolver: lts-19.27
+resolver: lts-20.18

exercises/practice/acronym/test/Tests.hs

@@ -4,12 +4,12 @@
 import Data.Foldable     (for_)
 import Data.String       (fromString)
 import Test.Hspec        (Spec, describe, it, shouldBe)
-import Test.Hspec.Runner (configFastFail, defaultConfig, hspecWith)
+import Test.Hspec.Runner (configFailFast, defaultConfig, hspecWith)
 
 import Acronym (abbreviate)
 
 main :: IO ()
-main = hspecWith defaultConfig {configFastFail = True} specs
+main = hspecWith defaultConfig {configFailFast = True} specs
 
 specs :: Spec
 specs = describe "abbreviate" $ for_ cases test

exercises/practice/all-your-base/stack.yaml

@@ -1 +1 @@
-resolver: lts-19.27
+resolver: lts-20.18

exercises/practice/all-your-base/test/Tests.hs

@@ -2,12 +2,12 @@
 
 import Data.Foldable     (for_)
 import Test.Hspec        (Spec, describe, it, shouldBe)
-import Test.Hspec.Runner (configFastFail, defaultConfig, hspecWith)
+import Test.Hspec.Runner (configFailFast, defaultConfig, hspecWith)
 
 import Base (Error(..), rebase)
 
 main :: IO ()
-main = hspecWith defaultConfig {configFastFail = True} specs
+main = hspecWith defaultConfig {configFailFast = True} specs
 
 specs :: Spec
 specs = describe "rebase" $ for_ cases test

exercises/practice/allergies/stack.yaml

@@ -1 +1 @@
-resolver: lts-19.27
+resolver: lts-20.18

exercises/practice/allergies/test/Tests.hs

@@ -2,7 +2,7 @@
 
 import Test.QuickCheck   (Gen, forAll, forAllShrink, elements, sublistOf, suchThat)
 import Test.Hspec        (Spec, describe, it, shouldBe)
-import Test.Hspec.Runner (configFastFail, defaultConfig, hspecWith)
+import Test.Hspec.Runner (configFailFast, defaultConfig, hspecWith)
 import Data.List         (delete)
 import Data.Maybe        (mapMaybe)
 
@@ -21,7 +21,7 @@ import Allergies
   )
 
 main :: IO ()
-main = hspecWith defaultConfig {configFastFail = True} specs
+main = hspecWith defaultConfig {configFailFast = True} specs
 
 specs :: Spec
 specs = do

exercises/practice/alphametics/stack.yaml

@@ -1 +1 @@
-resolver: lts-19.27
+resolver: lts-20.18

exercises/practice/alphametics/test/Tests.hs

@@ -4,12 +4,12 @@ import Data.Foldable     (for_)
 import Data.Function     (on)
 import Data.List         (sort)
 import Test.Hspec        (Spec, describe, it, shouldBe)
-import Test.Hspec.Runner (configFastFail, defaultConfig, hspecWith)
+import Test.Hspec.Runner (configFailFast, defaultConfig, hspecWith)
 
 import Alphametics (solve)
 
 main :: IO ()
-main = hspecWith defaultConfig {configFastFail = True} specs
+main = hspecWith defaultConfig {configFailFast = True} specs
 
 specs :: Spec
 specs = describe "solve" $ for_ cases test

exercises/practice/anagram/stack.yaml

@@ -1 +1 @@
-resolver: lts-19.27
+resolver: lts-20.18

exercises/practice/anagram/test/Tests.hs

@@ -3,12 +3,12 @@
 import Data.Foldable     (for_)
 import GHC.Exts          (fromList, toList)
 import Test.Hspec        (Spec, describe, it, shouldMatchList)
-import Test.Hspec.Runner (configFastFail, defaultConfig, hspecWith)
+import Test.Hspec.Runner (configFailFast, defaultConfig, hspecWith)
 
 import Anagram (anagramsFor)
 
 main :: IO ()
-main = hspecWith defaultConfig {configFastFail = True} specs
+main = hspecWith defaultConfig {configFailFast = True} specs
 
 specs :: Spec
 specs = describe "anagramsFor" $ for_ cases test

exercises/practice/armstrong-numbers/stack.yaml

@@ -1 +1 @@
-resolver: lts-19.27
+resolver: lts-20.18

exercises/practice/armstrong-numbers/test/Tests.hs

@@ -2,12 +2,12 @@
 
 import Data.Foldable     (for_)
 import Test.Hspec        (Spec, describe, it, shouldBe)
-import Test.Hspec.Runner (configFastFail, defaultConfig, hspecWith)
+import Test.Hspec.Runner (configFailFast, defaultConfig, hspecWith)
 
 import ArmstrongNumbers (armstrong)
 
 main :: IO ()
-main = hspecWith defaultConfig {configFastFail = True} specs
+main = hspecWith defaultConfig {configFailFast = True} specs
 
 specs :: Spec
 specs = describe "armstrong" $ for_ cases test

exercises/practice/atbash-cipher/stack.yaml

@@ -1 +1 @@
-resolver: lts-19.27
+resolver: lts-20.18

exercises/practice/atbash-cipher/test/Tests.hs

@@ -2,13 +2,13 @@
 
 import Data.Foldable     (for_)
 import Test.Hspec        (Spec, describe, it, shouldBe)
-import Test.Hspec.Runner (configFastFail, defaultConfig, hspecWith)
+import Test.Hspec.Runner (configFailFast, defaultConfig, hspecWith)
 import Data.String       (fromString)
 
 import Atbash (encode, decode)
 
 main :: IO ()
-main = hspecWith defaultConfig {configFastFail = True} specs
+main = hspecWith defaultConfig {configFailFast = True} specs
 
 specs :: Spec
 specs = do

exercises/practice/bank-account/stack.yaml

@@ -1 +1 @@
-resolver: lts-19.27
+resolver: lts-20.18

exercises/practice/bank-account/test/Tests.hs

@@ -4,7 +4,7 @@ import Data.Foldable      (for_)
 import Data.Traversable   (for)
 import Data.Maybe         (isNothing, catMaybes)
 import Test.Hspec         (Spec, it, shouldReturn)
-import Test.Hspec.Runner  (configFastFail, defaultConfig, hspecWith)
+import Test.Hspec.Runner  (configFailFast, defaultConfig, hspecWith)
 
 import BankAccount
   ( closeAccount
@@ -14,7 +14,7 @@ import BankAccount
   )
 
 main :: IO ()
-main = hspecWith defaultConfig {configFastFail = True} specs
+main = hspecWith defaultConfig {configFailFast = True} specs
 
 specs :: Spec
 specs = do

exercises/practice/beer-song/stack.yaml

@@ -1 +1 @@
-resolver: lts-19.27
+resolver: lts-20.18

exercises/practice/beer-song/test/Tests.hs

@@ -1,11 +1,11 @@
 import Control.Monad     (unless)
 import Test.Hspec        (Spec, describe, expectationFailure, it, shouldBe)
-import Test.Hspec.Runner (configFastFail, defaultConfig, hspecWith)
+import Test.Hspec.Runner (configFailFast, defaultConfig, hspecWith)
 
 import Beer (song)
 
 main :: IO ()
-main = hspecWith defaultConfig {configFastFail = True} specs
+main = hspecWith defaultConfig {configFailFast = True} specs
 
 specs :: Spec
 

exercises/practice/binary-search-tree/stack.yaml

@@ -1 +1 @@
-resolver: lts-19.27
+resolver: lts-20.18

exercises/practice/binary-search-tree/test/Tests.hs

@@ -1,5 +1,5 @@
 import Test.Hspec        (Spec, it, shouldBe, shouldNotBe)
-import Test.Hspec.Runner (configFastFail, defaultConfig, hspecWith)
+import Test.Hspec.Runner (configFailFast, defaultConfig, hspecWith)
 
 import BST
   ( bstLeft
@@ -13,7 +13,7 @@ import BST
   )
 
 main :: IO ()
-main = hspecWith defaultConfig {configFastFail = True} specs
+main = hspecWith defaultConfig {configFailFast = True} specs
 
 specs :: Spec
 specs = do

exercises/practice/binary-search/stack.yaml

@@ -1 +1 @@
-resolver: lts-19.27
+resolver: lts-20.18

exercises/practice/binary-search/test/Tests.hs

@@ -3,12 +3,12 @@
 import Data.Array        (Array, listArray)
 import Data.Foldable     (for_)
 import Test.Hspec        (Spec, describe, it, shouldBe)
-import Test.Hspec.Runner (configFastFail, defaultConfig, hspecWith)
+import Test.Hspec.Runner (configFailFast, defaultConfig, hspecWith)
 
 import BinarySearch      (find)
 
 main :: IO ()
-main = hspecWith defaultConfig {configFastFail = True} specs
+main = hspecWith defaultConfig {configFailFast = True} specs
 
 specs :: Spec
 specs = describe "find" $ for_ bases $ for_ cases . test

exercises/practice/binary/stack.yaml

@@ -1 +1 @@
-resolver: lts-19.27
+resolver: lts-20.18

exercises/practice/binary/test/Tests.hs

@@ -3,12 +3,12 @@
 
 import Data.Foldable     (for_)
 import Test.Hspec        (Spec, describe, it, shouldBe)
-import Test.Hspec.Runner (configFastFail, defaultConfig, hspecWith)
+import Test.Hspec.Runner (configFailFast, defaultConfig, hspecWith)
 
 import Binary (toDecimal)
 
 main :: IO ()
-main = hspecWith defaultConfig {configFastFail = True} specs
+main = hspecWith defaultConfig {configFailFast = True} specs
 
 specs :: Spec
 specs = describe "toDecimal" $ for_ cases test

exercises/practice/bob/stack.yaml

@@ -1 +1 @@
-resolver: lts-19.27
+resolver: lts-20.18

exercises/practice/bob/test/Tests.hs

@@ -3,13 +3,13 @@
 
 import Data.Foldable     (for_)
 import Test.Hspec        (Spec, describe, it, shouldBe)
-import Test.Hspec.Runner (configFastFail, defaultConfig, hspecWith)
+import Test.Hspec.Runner (configFailFast, defaultConfig, hspecWith)
 import Data.String       (fromString)
 
 import Bob (responseFor)
 
 main :: IO ()
-main = hspecWith defaultConfig {configFastFail = True} specs
+main = hspecWith defaultConfig {configFailFast = True} specs
 
 specs :: Spec
 specs = describe "responseFor" $ for_ cases test

exercises/practice/bowling/.meta/examples/success-standard/src/Bowling.hs

@@ -30,16 +30,17 @@ scoreRoll scoreState rolls' = do
 
 scoreRoll' :: Frame -> Int -> Int -> [Roll] -> ScoreState
 scoreRoll' _ ri _ (r:_) | r < 0 || r > 10 = Left $ InvalidRoll ri r
-scoreRoll' f@(Frame 10 (fr:_)) ri totalScore (r:_)
-  | throws f < 2 = Right (addRoll f r, succ ri, totalScore + fr + r)
-  | throws f == 2 && (fr == 10 || spare f) = addFillBall
-  | otherwise = Left $ InvalidRoll ri r -- no more rolls possible
+scoreRoll' f@(Frame 10 (fr:_)) ri totalScore (r:_) = case rolls f of
+  [_] -> Right (addRoll f r, succ ri, totalScore + fr + r)
+  [firstRoll, secondRoll] | fr == 10 || spare f -> addFillBall firstRoll secondRoll
+                          | otherwise -> noMoreRollsPossible
+  _ -> noMoreRollsPossible
   where
-    addFillBall :: ScoreState
-    addFillBall
+    noMoreRollsPossible = Left $ InvalidRoll ri r
+    addFillBall :: Int -> Int -> ScoreState
+    addFillBall firstRoll secondRoll
       | firstRoll == 10 && secondRoll /= 10 && secondRoll + r > 10 = Left $ InvalidRoll ri r
       | otherwise = Right (addRoll f r, succ ri, totalScore + r)
-      where [firstRoll, secondRoll] = rolls f
 scoreRoll' f@(Frame n _) ri totalScore rs@(r:_)
   | complete f = Right (Frame (succ n) [r], succ ri, totalScore + fscore f rs)
   | pins f + r <= 10 = Right (addRoll f r, succ ri, totalScore)

exercises/practice/bowling/stack.yaml

@@ -1 +1 @@
-resolver: lts-19.27
+resolver: lts-20.18

exercises/practice/bowling/test/Tests.hs

@@ -2,12 +2,12 @@
 
 import Data.Foldable     (for_)
 import Test.Hspec        (Spec, describe, it, shouldBe)
-import Test.Hspec.Runner (configFastFail, defaultConfig, hspecWith)
+import Test.Hspec.Runner (configFailFast, defaultConfig, hspecWith)
 
 import Bowling (score, BowlingError(..))
 
 main :: IO ()
-main = hspecWith defaultConfig {configFastFail = True} specs
+main = hspecWith defaultConfig {configFailFast = True} specs
 
 specs :: Spec
 specs = describe "roll, score" $ for_ cases test

exercises/practice/change/stack.yaml

@@ -1 +1 @@
-resolver: lts-19.27
+resolver: lts-20.18

exercises/practice/change/test/Tests.hs

@@ -3,12 +3,12 @@
 import Data.Foldable     (for_)
 import Data.List         (sort)
 import Test.Hspec        (Spec, it, shouldBe)
-import Test.Hspec.Runner (configFastFail, defaultConfig, hspecWith)
+import Test.Hspec.Runner (configFailFast, defaultConfig, hspecWith)
 
 import Change (findFewestCoins)
 
 main :: IO ()
-main = hspecWith defaultConfig {configFastFail = True} specs
+main = hspecWith defaultConfig {configFailFast = True} specs
 
 specs :: Spec
 specs = for_ cases test

exercises/practice/clock/stack.yaml

@@ -1 +1 @@
-resolver: lts-19.27
+resolver: lts-20.18

exercises/practice/clock/test/Tests.hs

@@ -2,12 +2,12 @@
 
 import Data.Foldable     (for_)
 import Test.Hspec        (Spec, describe, it, shouldBe)
-import Test.Hspec.Runner (configFastFail, defaultConfig, hspecWith)
+import Test.Hspec.Runner (configFailFast, defaultConfig, hspecWith)
 
 import Clock (addDelta, fromHourMin, toString)
 
 main :: IO ()
-main = hspecWith defaultConfig {configFastFail = True} specs
+main = hspecWith defaultConfig {configFailFast = True} specs
 
 specs :: Spec
 specs = do

exercises/practice/collatz-conjecture/stack.yaml

@@ -1 +1 @@
-resolver: lts-19.27
+resolver: lts-20.18

exercises/practice/collatz-conjecture/test/Tests.hs

@@ -3,12 +3,12 @@
 
 import Data.Foldable     (for_)
 import Test.Hspec        (Spec, describe, it, shouldBe)
-import Test.Hspec.Runner (configFastFail, defaultConfig, hspecWith)
+import Test.Hspec.Runner (configFailFast, defaultConfig, hspecWith)
 
 import CollatzConjecture (collatz)
 
 main :: IO ()
-main = hspecWith defaultConfig {configFastFail = True} specs
+main = hspecWith defaultConfig {configFailFast = True} specs
 
 specs :: Spec
 specs = describe "collatz" $ for_ cases test

exercises/practice/complex-numbers/stack.yaml

@@ -1 +1 @@
-resolver: lts-19.27
+resolver: lts-20.18