diff --git a/Trace/Hpc/Mix.hs b/Trace/Hpc/Mix.hs index 80009c55b7c1d5f3d3a1a4986560270c094bf4bc..d1533e2092df612a307e23f7d259734d2d40b794 100644 --- a/Trace/Hpc/Mix.hs +++ b/Trace/Hpc/Mix.hs @@ -14,15 +14,13 @@ module Trace.Hpc.Mix , CondBox(..) , mixCreate , readMix - , Trace.Hpc.Mix.getModificationTime , createMixEntryDom , MixEntryDom ) where -import System.Time (ClockTime(..)) -import System.Directory (getModificationTime) import Data.Maybe (catMaybes) +import Data.Time import Data.Tree import Data.Char @@ -41,16 +39,12 @@ import Trace.Hpc.Tix data Mix = Mix FilePath -- location of original file - Integer -- time (in seconds) of original file's last update, since 1970. + UTCTime -- time of original file's last update Hash -- hash of mix entry + timestamp Int -- tab stop value. [MixEntry] -- entries deriving (Show,Read) --- We would rather use ClockTime in Mix, but ClockTime has no Read instance in 6.4 and before, --- but does in 6.6. Definining the instance for ClockTime here is the Wrong Thing to do, --- because if some other program also defined that instance, we will not be able to compile. - type MixEntry = (HpcPos, BoxLabel) data BoxLabel = ExpBox Bool -- isAlt @@ -111,13 +105,6 @@ readMix dirNames mod' = do mixName :: FilePath -> String -> String mixName dirName name = dirName ++ "/" ++ name ++ ".mix" --- | Get modification time of a file. - -getModificationTime :: FilePath -> IO Integer -getModificationTime file = do - (TOD sec _) <- System.Directory.getModificationTime file - return $ sec - ------------------------------------------------------------------------------ type MixEntryDom a = Tree (HpcPos,a) diff --git a/hpc.cabal b/hpc.cabal index d4fcf43f26e1642e2ac3cfc8034fe5c4b7e0019f..10ffb134adce945469ea2cbac198f84a796bcf13 100644 --- a/hpc.cabal +++ b/hpc.cabal @@ -27,7 +27,7 @@ Library if flag(small_base) Build-Depends: base >= 3 && < 5, directory >= 1 && < 1.2, - old-time >= 1 && < 1.1, + time < 1.5, containers >= 0.1 && < 0.5 else Build-Depends: base < 3