[commit: packages/time] master, wip/travis: move ISO8601Week to separate module space (b802476)

git at git.haskell.org git at git.haskell.org
Sat May 7 06:42:37 UTC 2016 

Repository : ssh://git@git.haskell.org/time

On branches: master,wip/travis
Link       : http://git.haskell.org/packages/time.git/commitdiff/b802476ee193ac4616eb35945069fd9007aa39c6

>---------------------------------------------------------------

commit b802476ee193ac4616eb35945069fd9007aa39c6
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Mon Nov 14 01:49:03 2005 -0800

    move ISO8601Week to separate module space
    
    darcs-hash:20051114094903-ac6dd-606f84f89b9ef911bddbed72ef80778b57d4a586


>---------------------------------------------------------------

b802476ee193ac4616eb35945069fd9007aa39c6
 Data/Time/Calendar.hs             |  4 +---
 Data/Time/Calendar/ISO8601Week.hs |  7 +------
 Data/Time/LocalTime/Format.hs     |  2 +-
 Makefile                          | 10 +++++-----
 TimeLib.cabal                     |  2 +-
 test/ClipDates.hs                 |  1 +
 test/ConvertBack.hs               |  1 +
 test/LongWeekYears.hs             |  1 +
 test/TestCalendars.hs             |  1 +
 test/TestTime.hs                  |  1 +
 10 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/Data/Time/Calendar.hs b/Data/Time/Calendar.hs
index 8cf43ce..db87917 100644
--- a/Data/Time/Calendar.hs
+++ b/Data/Time/Calendar.hs
@@ -5,12 +5,10 @@ module Data.Time.Calendar
 	module Data.Time.Calendar.Days,
 	module Data.Time.Calendar.YearDay,
 	module Data.Time.Calendar.MonthDay,
-	module Data.Time.Calendar.Gregorian,
-	module Data.Time.Calendar.ISO8601Week
+	module Data.Time.Calendar.Gregorian
 ) where
 
 import Data.Time.Calendar.Days
 import Data.Time.Calendar.YearDay
 import Data.Time.Calendar.MonthDay
 import Data.Time.Calendar.Gregorian
-import Data.Time.Calendar.ISO8601Week
diff --git a/Data/Time/Calendar/ISO8601Week.hs b/Data/Time/Calendar/ISO8601Week.hs
index 8a9e61f..88e8e3e 100644
--- a/Data/Time/Calendar/ISO8601Week.hs
+++ b/Data/Time/Calendar/ISO8601Week.hs
@@ -1,11 +1,6 @@
 {-# OPTIONS -Wall -Werror #-}
 
--- #hide
-module Data.Time.Calendar.ISO8601Week
-	(
-	-- * ISO 8601 Week calendar
-	module Data.Time.Calendar.ISO8601Week
-	) where
+module Data.Time.Calendar.ISO8601Week where
 
 import Data.Time.Calendar.YearDay
 import Data.Time.Calendar.Days
diff --git a/Data/Time/LocalTime/Format.hs b/Data/Time/LocalTime/Format.hs
index 8457086..3fbbe0e 100644
--- a/Data/Time/LocalTime/Format.hs
+++ b/Data/Time/LocalTime/Format.hs
@@ -1,6 +1,5 @@
 {-# OPTIONS -Wall -Werror #-}
 
-
 -- #hide
 module Data.Time.LocalTime.Format
 	(
@@ -11,6 +10,7 @@ module Data.Time.LocalTime.Format
 import Data.Time.LocalTime.LocalTime
 import Data.Time.LocalTime.TimeOfDay
 import Data.Time.LocalTime.TimeZone
+import Data.Time.Calendar.ISO8601Week
 import Data.Time.Calendar
 import Data.Time.Calendar.Private
 import Data.Time.Clock
diff --git a/Makefile b/Makefile
index 9bfdf0c..b387425 100644
--- a/Makefile
+++ b/Makefile
@@ -97,16 +97,15 @@ Data/Time/Calendar/Gregorian.o : Data/Time/Calendar/Private.hi
 Data/Time/Calendar/Gregorian.o : Data/Time/Calendar/Days.hi
 Data/Time/Calendar/Gregorian.o : Data/Time/Calendar/YearDay.hi
 Data/Time/Calendar/Gregorian.o : Data/Time/Calendar/MonthDay.hi
-Data/Time/Calendar/ISO8601Week.o : Data/Time/Calendar/ISO8601Week.hs
-Data/Time/Calendar/ISO8601Week.o : Data/Time/Calendar/Private.hi
-Data/Time/Calendar/ISO8601Week.o : Data/Time/Calendar/Days.hi
-Data/Time/Calendar/ISO8601Week.o : Data/Time/Calendar/YearDay.hi
 Data/Time/Calendar.o : Data/Time/Calendar.hs
-Data/Time/Calendar.o : Data/Time/Calendar/ISO8601Week.hi
 Data/Time/Calendar.o : Data/Time/Calendar/Gregorian.hi
 Data/Time/Calendar.o : Data/Time/Calendar/MonthDay.hi
 Data/Time/Calendar.o : Data/Time/Calendar/YearDay.hi
 Data/Time/Calendar.o : Data/Time/Calendar/Days.hi
+Data/Time/Calendar/ISO8601Week.o : Data/Time/Calendar/ISO8601Week.hs
+Data/Time/Calendar/ISO8601Week.o : Data/Time/Calendar/Private.hi
+Data/Time/Calendar/ISO8601Week.o : Data/Time/Calendar/Days.hi
+Data/Time/Calendar/ISO8601Week.o : Data/Time/Calendar/YearDay.hi
 Data/Time/Calendar/JulianYearDay.o : Data/Time/Calendar/JulianYearDay.hs
 Data/Time/Calendar/JulianYearDay.o : Data/Time/Calendar/Private.hi
 Data/Time/Calendar/JulianYearDay.o : Data/Time/Calendar/Days.hi
@@ -151,6 +150,7 @@ Data/Time/LocalTime/Format.o : Data/Time/Clock/POSIX.hi
 Data/Time/LocalTime/Format.o : Data/Time/Clock.hi
 Data/Time/LocalTime/Format.o : Data/Time/Calendar/Private.hi
 Data/Time/LocalTime/Format.o : Data/Time/Calendar.hi
+Data/Time/LocalTime/Format.o : Data/Time/Calendar/ISO8601Week.hi
 Data/Time/LocalTime/Format.o : Data/Time/LocalTime/TimeZone.hi
 Data/Time/LocalTime/Format.o : Data/Time/LocalTime/TimeOfDay.hi
 Data/Time/LocalTime/Format.o : Data/Time/LocalTime/LocalTime.hi
diff --git a/TimeLib.cabal b/TimeLib.cabal
index b10cb7c..16a43c7 100644
--- a/TimeLib.cabal
+++ b/TimeLib.cabal
@@ -12,6 +12,7 @@ Synopsis:	a new time library
 Exposed-modules:
 	Data.Fixed,
 	Data.Time.Calendar,
+	Data.Time.Calendar.ISO8601Week,
 	Data.Time.Calendar.Julian,
 	Data.Time.Calendar.Easter,
 	Data.Time.Clock,
@@ -26,7 +27,6 @@ Other-modules:
 	Data.Time.Calendar.YearDay,
 	Data.Time.Calendar.MonthDay,
 	Data.Time.Calendar.Gregorian,
-	Data.Time.Calendar.ISO8601Week,
 	Data.Time.Calendar.JulianYearDay,
 	Data.Time.Clock.Scale,
 	Data.Time.Clock.UTC,
diff --git a/test/ClipDates.hs b/test/ClipDates.hs
index f9abb6c..cd0fe9c 100644
--- a/test/ClipDates.hs
+++ b/test/ClipDates.hs
@@ -2,6 +2,7 @@
 
 module Main where
 
+import Data.Time.Calendar.ISO8601Week
 import Data.Time.Calendar
 import Control.Monad
 
diff --git a/test/ConvertBack.hs b/test/ConvertBack.hs
index 7f3ea1e..76dda86 100644
--- a/test/ConvertBack.hs
+++ b/test/ConvertBack.hs
@@ -3,6 +3,7 @@
 module Main where
 
 import Data.Time.Calendar.Julian
+import Data.Time.Calendar.ISO8601Week
 import Data.Time.Calendar
 
 checkDay :: (Show t) => (Day -> t) -> (t -> Day) -> Day -> IO ()
diff --git a/test/LongWeekYears.hs b/test/LongWeekYears.hs
index 3715b6d..674e8c6 100644
--- a/test/LongWeekYears.hs
+++ b/test/LongWeekYears.hs
@@ -2,6 +2,7 @@
 
 module Main where
 
+import Data.Time.Calendar.ISO8601Week
 import Data.Time.Calendar
 
 longYear :: Integer -> Bool
diff --git a/test/TestCalendars.hs b/test/TestCalendars.hs
index 3dd935a..d463b3a 100644
--- a/test/TestCalendars.hs
+++ b/test/TestCalendars.hs
@@ -3,6 +3,7 @@
 module Main where
 
 import Data.Time.Calendar.Julian
+import Data.Time.Calendar.ISO8601Week
 import Data.Time.Calendar
 
 showers :: [(String,Day -> String)]
diff --git a/test/TestTime.hs b/test/TestTime.hs
index 2870026..f95c4ca 100644
--- a/test/TestTime.hs
+++ b/test/TestTime.hs
@@ -2,6 +2,7 @@
 
 module Main where
 
+import Data.Time.Calendar.ISO8601Week
 import Data.Time
 
 showCal :: Integer -> IO ()

More information about the ghc-commits mailing list