diff --git a/.gitignore b/.gitignore index 1f94316f277005e8c372a97d816abe5e908f2134..283f8c996ab97f8f5a9085826ca7647e4499c714 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ *.o *.hi +Main diff --git a/lib/GEODE/Metadata.hs b/lib/GEODE/Metadata.hs index 5bdbfc464f96dd66ccc3ebcadaaf6dd26d2dea78..529a50e78d811820d11059d513cdb00bfb6b3897 100644 --- a/lib/GEODE/Metadata.hs +++ b/lib/GEODE/Metadata.hs @@ -24,7 +24,7 @@ import GEODE.Metadata.SplitContext as SplitContext hiding (page, rank) import GEODE.Metadata.TSV as TSV import GEODE.Metadata.TSV.Header as TSV_Header ( Concat(..), DefaultFields(..), Glue(..), HasDefaultHeader(..) - , HasDefaultHeader(..) ) + , WithDefaultHeader(..) ) import GEODE.Metadata.Types as Types list :: [Text] -> String diff --git a/test/GEODE/Metadata/TestEntry.hs b/test/GEODE/Metadata/TestEntry.hs index ec7aa2c047dd48c732ceb9e30af901c956e5513b..bc85c1a676c0d1de59bd5076886678a0fc543850 100644 --- a/test/GEODE/Metadata/TestEntry.hs +++ b/test/GEODE/Metadata/TestEntry.hs @@ -1,12 +1,9 @@ {-# LANGUAGE OverloadedStrings #-} module GEODE.Metadata.TestEntry (testEntry) where -import Control.Monad.State (evalState) -import Data.ByteString.Char8 as BS (pack) import Data.Csv (ToNamedRecord(..)) import Data.Foldable (toList) import Data.HashMap.Strict ((!?)) -import Data.Map as Map (empty) import Data.Text (dropEnd) import GEODE.Metadata (evalSplit, newEntry, normalize) import GEODE.Metadata.Entry (Entry(..)) diff --git a/test/Main b/test/Main deleted file mode 100755 index 23ac0dc919d62b7ef40a3873297c16a3620c54b3..0000000000000000000000000000000000000000 Binary files a/test/Main and /dev/null differ diff --git a/test/Main.hs b/test/Main.hs index 39fad5f72f73bf381c724aa55dc00b48331bbe01..5aa6b4dc2c1d8aaefce5c99a6c346ebf47ef6e1c 100644 --- a/test/Main.hs +++ b/test/Main.hs @@ -3,7 +3,6 @@ module Main (main) where import Test.HUnit (Test(..), runTestTTAndExit) import GEODE.Metadata.TestPrimaryKey (testPrimaryKey) import GEODE.Metadata.TestEntry (testEntry) -import System.Exit (exitFailure, exitSuccess) testMetadata :: Test testMetadata = TestLabel "Metadata suite" $