[commit: packages/time] format-widths, ghc, improve-leapseconds, master, posix-perf, tasty, wip/travis: sort out GHC 6.12 warnings (66ee658)

[git at git.haskell.org]

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

On branches: format-widths,ghc,improve-leapseconds,master,posix-perf,tasty,wip/travis
Link       : http://git.haskell.org/packages/time.git/commitdiff/66ee658898559bfff6f7de50015f4827f5e7a967

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

commit 66ee658898559bfff6f7de50015f4827f5e7a967
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Sat Apr 10 20:34:14 2010 -0700

    sort out GHC 6.12 warnings
    
    Ignore-this: f97673c30230c03de97445fbab0e4bf6
    
    darcs-hash:20100411033414-ac6dd-1c96f2e3e15eb0296f7e20aaf5b695b7dff225ef


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

66ee658898559bfff6f7de50015f4827f5e7a967
 Data/Time/Format/Parse.hs        | 2 +-
 Data/Time/LocalTime/TimeOfDay.hs | 6 +++---
 Makefile                         | 2 +-
 time.cabal                       | 1 +
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Data/Time/Format/Parse.hs b/Data/Time/Format/Parse.hs
index 1aaf0d0..d30d75c 100644
--- a/Data/Time/Format/Parse.hs
+++ b/Data/Time/Format/Parse.hs
@@ -33,7 +33,7 @@ string :: String -> ReadP String
 string this = do s <- look; scan this s
   where
     scan []     _                               = do return this
-    scan (x:xs) (y:ys) | toUpper x == toUpper y = do get; scan xs ys
+    scan (x:xs) (y:ys) | toUpper x == toUpper y = do _ <- get; scan xs ys
     scan _      _                               = do pfail
 -- | Convert string to upper case.
 up :: String -> String
diff --git a/Data/Time/LocalTime/TimeOfDay.hs b/Data/Time/LocalTime/TimeOfDay.hs
index 8b5ef19..1a360b7 100644
--- a/Data/Time/LocalTime/TimeOfDay.hs
+++ b/Data/Time/LocalTime/TimeOfDay.hs
@@ -41,9 +41,9 @@ instance Show TimeOfDay where
 
 makeTimeOfDayValid :: Int -> Int -> Pico -> Maybe TimeOfDay
 makeTimeOfDayValid h m s = do
-	clipValid 0 23 h
-	clipValid 0 59 m
-	clipValid 0 60.999999999999 s
+	_ <- clipValid 0 23 h
+	_ <- clipValid 0 59 m
+	_ <- clipValid 0 60.999999999999 s
 	return (TimeOfDay h m s)
 
 -- | Convert a ToD in UTC to a ToD in some timezone, together with a day adjustment.
diff --git a/Makefile b/Makefile
index 1b6d17b..d56bf1a 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@ configure:
 	cabal configure --enable-library-profiling --enable-executable-profiling
 
 build: configure
-	cabal build --ghc-options="-Wall -Werror"
+	cabal build --ghc-options=-Werror
 
 test: build
 	cabal test
diff --git a/time.cabal b/time.cabal
index b86a5cf..51a77db 100644
--- a/time.cabal
+++ b/time.cabal
@@ -28,6 +28,7 @@ extra-tmp-files:
 library
 {
     build-depends: base == 4.*, old-locale
+    ghc-options: -Wall
     if os(windows)
         build-depends: Win32
     exposed-modules: