[commit: packages/time] master: changed uses of mkTyCon to mkTyCon3 (8f9b7ae)
git at git.haskell.org
git at git.haskell.org
Fri Jan 23 23:00:42 UTC 2015
Repository : ssh://git@git.haskell.org/time
On branch : master
Link : http://git.haskell.org/packages/time.git/commitdiff/8f9b7ae035401105e311dcd8596da5d1aa2f5801
>---------------------------------------------------------------
commit 8f9b7ae035401105e311dcd8596da5d1aa2f5801
Author: blackredtree <blackredtree at gmail.com>
Date: Thu Sep 13 15:00:34 2012 -0700
changed uses of mkTyCon to mkTyCon3
Ignore-this: f31d15b2eccb114f507cadfcda0b0630
darcs-hash:20120913220034-08fed-bb57957a23120580281bea112d59d15509920b0e
>---------------------------------------------------------------
8f9b7ae035401105e311dcd8596da5d1aa2f5801
Data/Time/Calendar/Days.hs | 2 +-
Data/Time/Clock/Scale.hs | 4 ++--
Data/Time/Clock/TAI.hs | 2 +-
Data/Time/Clock/UTC.hs | 4 ++--
Data/Time/LocalTime/LocalTime.hs | 4 ++--
Data/Time/LocalTime/TimeOfDay.hs | 2 +-
Data/Time/LocalTime/TimeZone.hs | 2 +-
7 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/Data/Time/Calendar/Days.hs b/Data/Time/Calendar/Days.hs
index c09a273..6911833 100644
--- a/Data/Time/Calendar/Days.hs
+++ b/Data/Time/Calendar/Days.hs
@@ -27,7 +27,7 @@ instance NFData Day where
rnf (ModifiedJulianDay a) = rnf a
instance Typeable Day where
- typeOf _ = mkTyConApp (mkTyCon "Data.Time.Calendar.Days.Day") []
+ typeOf _ = mkTyConApp (mkTyCon3 "time" "Data.Time.Calendar.Days" "Day") []
-- necessary because H98 doesn't have "cunning newtype" derivation
instance Enum Day where
diff --git a/Data/Time/Clock/Scale.hs b/Data/Time/Clock/Scale.hs
index ffa52a2..237a77b 100644
--- a/Data/Time/Clock/Scale.hs
+++ b/Data/Time/Clock/Scale.hs
@@ -35,7 +35,7 @@ instance NFData UniversalTime where
rnf (ModJulianDate a) = rnf a
instance Typeable UniversalTime where
- typeOf _ = mkTyConApp (mkTyCon "Data.Time.Clock.Scale.UniversalTime") []
+ typeOf _ = mkTyConApp (mkTyCon3 "time" "Data.Time.Clock.Scale" "UniversalTime") []
-- | This is a length of time, as measured by a clock.
-- Conversion functions will treat it as seconds.
@@ -55,7 +55,7 @@ newtype DiffTime = MkDiffTime Pico deriving (Eq,Ord
instance NFData DiffTime -- FIXME: Data.Fixed had no NFData instances yet at time of writing
instance Typeable DiffTime where
- typeOf _ = mkTyConApp (mkTyCon "Data.Time.Clock.Scale.DiffTime") []
+ typeOf _ = mkTyConApp (mkTyCon3 "time" "Data.Time.Clock.Scale" "DiffTime") []
-- necessary because H98 doesn't have "cunning newtype" derivation
instance Enum DiffTime where
diff --git a/Data/Time/Clock/TAI.hs b/Data/Time/Clock/TAI.hs
index 77c2134..5e6bfef 100644
--- a/Data/Time/Clock/TAI.hs
+++ b/Data/Time/Clock/TAI.hs
@@ -40,7 +40,7 @@ instance NFData AbsoluteTime where
rnf (MkAbsoluteTime a) = rnf a
instance Typeable AbsoluteTime where
- typeOf _ = mkTyConApp (mkTyCon "Data.Time.Clock.TAI.AbsoluteTime") []
+ typeOf _ = mkTyConApp (mkTyCon3 "time" "Data.Time.Clock.TAI" "AbsoluteTime") []
instance Show AbsoluteTime where
show t = show (utcToLocalTime utc (taiToUTCTime (const 0) t)) ++ " TAI" -- ugly, but standard apparently
diff --git a/Data/Time/Clock/UTC.hs b/Data/Time/Clock/UTC.hs
index 4f3c23a..da1ecc2 100644
--- a/Data/Time/Clock/UTC.hs
+++ b/Data/Time/Clock/UTC.hs
@@ -45,7 +45,7 @@ instance NFData UTCTime where
rnf (UTCTime d t) = d `deepseq` t `deepseq` ()
instance Typeable UTCTime where
- typeOf _ = mkTyConApp (mkTyCon "Data.Time.Clock.UTC.UTCTime") []
+ typeOf _ = mkTyConApp (mkTyCon3 "time" "Data.Time.Clock.UTC" "UTCTime") []
instance Eq UTCTime where
(UTCTime da ta) == (UTCTime db tb) = (da == db) && (ta == tb)
@@ -75,7 +75,7 @@ newtype NominalDiffTime = MkNominalDiffTime Pico deriving (Eq,Ord
instance NFData NominalDiffTime -- FIXME: Data.Fixed had no NFData instances yet at time of writing
instance Typeable NominalDiffTime where
- typeOf _ = mkTyConApp (mkTyCon "Data.Time.Clock.UTC.NominalDiffTime") []
+ typeOf _ = mkTyConApp (mkTyCon3 "time" "Data.Time.Clock.UTC" "NominalDiffTime") []
instance Enum NominalDiffTime where
succ (MkNominalDiffTime a) = MkNominalDiffTime (succ a)
diff --git a/Data/Time/LocalTime/LocalTime.hs b/Data/Time/LocalTime/LocalTime.hs
index feb0341..02f06a4 100644
--- a/Data/Time/LocalTime/LocalTime.hs
+++ b/Data/Time/LocalTime/LocalTime.hs
@@ -44,7 +44,7 @@ instance NFData LocalTime where
rnf (LocalTime d t) = d `deepseq` t `deepseq` ()
instance Typeable LocalTime where
- typeOf _ = mkTyConApp (mkTyCon "Data.Time.LocalTime.LocalTime.LocalTime") []
+ typeOf _ = mkTyConApp (mkTyCon3 "time" "Data.Time.LocalTime.LocalTime" "LocalTime") []
instance Show LocalTime where
show (LocalTime d t) = (showGregorian d) ++ " " ++ (show t)
@@ -87,7 +87,7 @@ instance NFData ZonedTime where
rnf (ZonedTime lt z) = lt `deepseq` z `deepseq` ()
instance Typeable ZonedTime where
- typeOf _ = mkTyConApp (mkTyCon "Data.Time.LocalTime.LocalTime.ZonedTime") []
+ typeOf _ = mkTyConApp (mkTyCon3 "time" "Data.Time.LocalTime.LocalTime" "ZonedTime") []
utcToZonedTime :: TimeZone -> UTCTime -> ZonedTime
utcToZonedTime zone time = ZonedTime (utcToLocalTime zone time) zone
diff --git a/Data/Time/LocalTime/TimeOfDay.hs b/Data/Time/LocalTime/TimeOfDay.hs
index ed0dbed..8fdf539 100644
--- a/Data/Time/LocalTime/TimeOfDay.hs
+++ b/Data/Time/LocalTime/TimeOfDay.hs
@@ -43,7 +43,7 @@ instance NFData TimeOfDay where
rnf (TimeOfDay h m s) = h `deepseq` m `deepseq` s `seq` () -- FIXME: Data.Fixed had no NFData instances yet at time of writing
instance Typeable TimeOfDay where
- typeOf _ = mkTyConApp (mkTyCon "Data.Time.LocalTime.TimeOfDay.TimeOfDay") []
+ typeOf _ = mkTyConApp (mkTyCon3 "time" "Data.Time.LocalTime.TimeOfDay" "TimeOfDay") []
-- | Hour zero
midnight :: TimeOfDay
diff --git a/Data/Time/LocalTime/TimeZone.hs b/Data/Time/LocalTime/TimeZone.hs
index 16b2e52..689288f 100644
--- a/Data/Time/LocalTime/TimeZone.hs
+++ b/Data/Time/LocalTime/TimeZone.hs
@@ -45,7 +45,7 @@ instance NFData TimeZone where
rnf (TimeZone m so n) = m `deepseq` so `deepseq` n `deepseq` ()
instance Typeable TimeZone where
- typeOf _ = mkTyConApp (mkTyCon "Data.Time.LocalTime.TimeZone.TimeZone") []
+ typeOf _ = mkTyConApp (mkTyCon3 "time" "Data.Time.LocalTime.TimeZone" "TimeZone") []
-- | Create a nameless non-summer timezone for this number of minutes
minutesToTimeZone :: Int -> TimeZone
More information about the ghc-commits
mailing list