Clear the -Wall warnings in test/ and hoist -Wall to the top level

onix.cabal

@@ -4,7 +4,7 @@ cabal-version: 1.12
 --
 -- see: https://github.com/sol/hpack
 --
--- hash: 266fcbde15564c65aa539a9de93481d85c7dfb8cc735f00132fafc247db05cd9
+-- hash: 1e36df2a46c362165a25b450dc435b8ada105cb0d0a304a8fed95cd867ac3e74
 
 name:           onix
 version:        0.1.0.0
@@ -39,7 +39,7 @@ library
       Paths_onix
   hs-source-dirs:
       src
-  ghc-options: -Wall
+  ghc-options: -Wall -Wcompat
   build-depends:
       base >=4.7 && <5
     , bytestring
@@ -63,7 +63,7 @@ executable onix-exe
       Paths_onix
   hs-source-dirs:
       app
-  ghc-options: -threaded -rtsopts -with-rtsopts=-N -Wall
+  ghc-options: -Wall -Wcompat -threaded -rtsopts -with-rtsopts=-N
   build-depends:
       base >=4.7 && <5
     , onix
@@ -82,7 +82,7 @@ test-suite onix-test
       Paths_onix
   hs-source-dirs:
       test
-  ghc-options: -threaded -rtsopts -with-rtsopts=-N -Wall
+  ghc-options: -Wall -Wcompat -threaded -rtsopts -with-rtsopts=-N
   build-depends:
       HUnit
     , base >=4.7 && <5

package.yaml

@@ -19,13 +19,15 @@ extra-source-files:
 # common to point users to the README.md file.
 description: Please see the README on GitHub at <https://github.com/kogai/onix#readme>
 
+ghc-options:
+  - -Wall
+  - -Wcompat
+
 dependencies:
   - base >= 4.7 && < 5
 
 library:
   source-dirs: src
-  ghc-options:
-    - -Wall
   dependencies:
     - mustache
     - text
@@ -49,7 +51,6 @@ executables:
       - -threaded
       - -rtsopts
       - -with-rtsopts=-N
-      - -Wall
     dependencies:
       - onix
       - optparse-applicative
@@ -62,7 +63,6 @@ tests:
       - -threaded
       - -rtsopts
       - -with-rtsopts=-N
-      - -Wall
     dependencies:
       - onix
       - HUnit

test/Spec.hs

@@ -3,7 +3,6 @@ module Main (main) where
 import System.Exit (exitFailure, exitSuccess)
 import Test.HUnit
   ( Counts (errors, failures),
-    Test (..),
     Testable (test),
     runTestTT,
   )

test/TestCode.hs

@@ -3,16 +3,13 @@
 module TestCode (tests) where
 
 import Code
-import qualified Data.Map as M
-import Data.Text (Text, pack, unpack)
 import qualified Data.Vector as V
 import qualified Model as Md
-import Test.HUnit (Test (TestCase, TestList), assertEqual)
-import Text.XML (def, parseText, readFile)
-import Util
+import Test.HUnit (Test (TestCase), assertEqual)
+import Util (uniq)
 import Xsd (getSchema)
-import qualified Xsd as X
 
+tests :: [Test]
 tests =
   [ TestCase
       ( do

test/TestMixed.hs

@@ -3,12 +3,9 @@
 module TestMixed (tests) where
 
 import qualified Data.Map as M
-import Data.Text (Text, pack, unpack)
 import Mixed
-import qualified Model as Md
-import Test.HUnit (Test (TestCase, TestList), assertEqual)
-import Text.XML (def, parseText, readFile)
-import Util
+import Test.HUnit (Test (TestCase), assertEqual)
+import Util (unwrap)
 import Xsd
 
 tests :: [Test]

test/TestModel.hs

@@ -3,15 +3,14 @@
 module TestModel (tests) where
 
 import qualified Data.Map as M
-import Data.Text (Text, pack, unpack)
 import Model
 import qualified Model as Md
-import Test.HUnit (Test (TestCase, TestList), assertEqual)
+import Test.HUnit (Test (TestCase), assertEqual)
 import TestUtils (makeTargetQName)
-import Text.XML (def, parseText, readFile)
-import Util
+import Util (unwrap)
 import Xsd
 
+expected1 :: Type
 expected1 =
   TypeSimple
     ( AtomicType
@@ -22,13 +21,15 @@ expected1 =
         []
     )
 
+expected2 :: Type
 expected2 =
   TypeSimple
     ( ListType
         (Ref $ makeTargetQName "List91")
         []
     )
 
+expected3 :: Type
 expected3 =
   TypeSimple
     ( AtomicType
@@ -53,6 +54,7 @@ expected3 =
         [Documentation "Notification or update type code"]
     )
 
+expected4 :: Type
 expected4 =
   TypeComplex
     ( ComplexType
@@ -89,6 +91,7 @@ expected4 =
         }
     )
 
+tests :: [Test]
 tests =
   [ TestCase
       ( do
@@ -121,7 +124,8 @@ tests =
     TestCase
       ( do
           scm <- getSchema "./fixtures/test_model_atomic.xsd"
-          let actual = (typeToText . unwrap . M.lookup (makeTargetQName "NonEmptyString") . schemaTypes) scm
+          let key = makeTargetQName "NonEmptyString"
+              actual = (typeToText . unwrap . M.lookup key . schemaTypes) scm
           assertEqual "can derive string type" "string" actual
       ),
     TestCase
@@ -145,7 +149,8 @@ tests =
     TestCase
       ( do
           scm <- getSchema "./fixtures/test_model_atom_ref_bylist.xsd"
-          let actual = (typeToText . unwrap . M.lookup (makeTargetQName "nameForTest") . schemaTypes) scm
+          let key = makeTargetQName "nameForTest"
+              actual = (typeToText . unwrap . M.lookup key . schemaTypes) scm
           assertEqual "can derive referenced type" "BibleContents" actual
       ),
     TestCase

test/TestParser.hs

@@ -3,12 +3,11 @@
 module TestParser (tests) where
 
 import qualified Data.Map as M
-import Data.Text (Text, pack, unpack)
-import Model (Kind (Tag), dropDuplicate, model, models)
-import Test.HUnit (Test (TestCase, TestList), assertEqual)
+import Test.HUnit (Test (TestCase), assertEqual)
 import TestUtils (makeTargetQName)
 import Xsd
 
+expected :: ElementInline
 expected =
   ElementInline
     { elementName = makeTargetQName "ONIXMessage",
@@ -88,6 +87,7 @@ expected =
       elementAnnotations = []
     }
 
+tests :: [Test]
 tests =
   [ TestCase
       ( do

test/TestUtils.hs

@@ -2,9 +2,7 @@
 
 module TestUtils (makeTargetQName) where
 
-import Data.Text (Text, pack, unpack)
-import Model (Kind (Tag), dropDuplicate, model, models)
-import Test.HUnit (Test (TestCase, TestList), assertEqual)
+import Data.Text (Text)
 import Xsd
   ( Namespace (Namespace, fromNamespace),
     QName (QName, qnName, qnNamespace),