more build fixups

Author: stepcut

.github/workflows/haskell-ci.yml

@@ -14,8 +14,12 @@
 #
 name: Haskell-CI
 on:
-  - push
-  - pull_request
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
 jobs:
   linux:
     name: Haskell-CI - Linux - ${{ matrix.compiler }}
@@ -241,8 +245,6 @@ jobs:
           echo "packages: ${PKGDIR_reform}" >> cabal.project
           if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo "package reform" >> cabal.project ; fi
           if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo "    ghc-options: -Werror=missing-methods -Werror=missing-fields" >> cabal.project ; fi
-          if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo "package reform" >> cabal.project ; fi
-          if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo "    ghc-options: -Werror=unused-packages" >> cabal.project ; fi
           if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo "package reform" >> cabal.project ; fi
           if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo "    ghc-options: -Werror=incomplete-patterns -Werror=incomplete-uni-patterns" >> cabal.project ; fi
           cat >> cabal.project <<EOF

Text/Reform/Core.hs

@@ -98,6 +98,7 @@ instance (SG.Semigroup input, Monad m) => SG.Semigroup (Environment m input) whe
                  (Found x, Found y) -> return $ Found (x SG.<> y)
                  (Found x, _      ) -> return $ Found x
                  (_      , Found y) -> return $ Found y
+                 (Default, Default) -> return Default
 
 -- | Not quite sure when this is useful and so hard to say if the rules for combining things with Missing/Default are correct
 instance (SG.Semigroup input, Monad m) => Monoid (Environment m input) where

Text/Reform/Generalized.hs

@@ -41,6 +41,7 @@ input fromInput toView initialValue =
                     return ( View $ const $ toView i initialValue
                            , return $ Error [(unitRange i, error)]
                            )
+                (Found fromInput) -> error "input: How could this even happen?"
                 Missing ->
                     return ( View $ const $ toView i initialValue
                            , return $ Error [(unitRange i, commonFormError (InputMissing i))]
@@ -306,6 +307,7 @@ inputChoiceForms def choices mkView =
 
       selectFirst :: [(Form m input error view proof a, lbl)] -> [(Form m input error view proof a, lbl, Bool)]
       selectFirst ((frm, lbl):fs) = (frm,lbl,True) : map (\(frm',lbl') -> (frm', lbl', False)) fs
+      selectFirst [] = []
 
       markSelected :: Int -> [(Int, (Form m input error view proof a, lbl))] -> [(Form m input error view proof a, lbl, Bool)]
       markSelected n choices =

cabal.haskell-ci

@@ -0,0 +1,3 @@
+branches: master
+
+error-unused-packages: False