convertible 1.0.11.1 → 1.1.0.0
raw patch · 4 files changed
+12/−44 lines, 4 filesdep ~basedep ~mtldep ~timenew-uploader
Dependency ranges changed: base, mtl, time
Files
- Data/Convertible.hs +2/−3
- Data/Convertible/Instances/Time.hs +0/−13
- Data/Convertible/Utils.hs +0/−9
- convertible.cabal +10/−19
Data/Convertible.hs view
@@ -31,10 +31,9 @@ module Data.Convertible ( module Data.Convertible.Base,- module Data.Convertible.Utils,- module Data.Convertible.Instances+ module Data.Convertible.Utils ) where import Data.Convertible.Base import Data.Convertible.Utils-import Data.Convertible.Instances+import Data.Convertible.Instances ()
Data/Convertible/Instances/Time.hs view
@@ -29,12 +29,8 @@ import Data.Convertible.Instances.Num() import qualified System.Time as ST import Data.Time-import Data.Time.Clock import Data.Time.Clock.POSIX import Data.Time.Calendar.OrdinalDate-#ifndef TIME_GT_113-import Data.Typeable-#endif import Data.Ratio import Foreign.C.Types @@ -59,15 +55,6 @@ ---------------------------------------------------------------------- ------------------------------ POSIX and UTC times--#ifndef TIME_GT_113-instance Typeable NominalDiffTime where- typeOf _ = mkTypeName "NominalDiffTime"--instance Typeable UTCTime where- typeOf _ = mkTypeName "UTCTime"-#endif- {- Covered under Real a instance Convertible Rational POSIXTime where safeConvert = return . fromRational
Data/Convertible/Utils.hs view
@@ -19,7 +19,6 @@ -} module Data.Convertible.Utils(boundedConversion,- mkTypeName, convertVia ) where@@ -48,14 +47,6 @@ then convError ("Input value outside of bounds: " ++ show (smallest, biggest)) inp else return result--{- | Useful for defining 'Typeable' instances. Example:-->instance Typeable TimeOfDay where-> typeOf _ = mkTypeName "TimeOfDay"--}-mkTypeName :: String -> TypeRep-mkTypeName name = mkTyConApp (mkTyCon name) [] {- | Useful for defining conversions that are implemented in terms of other conversions via an intermediary type. Instead of:
convertible.cabal view
@@ -1,8 +1,8 @@ Name: convertible-Version: 1.0.11.1+Version: 1.1.0.0 License: BSD3-Maintainer: John Goerzen <jgoerzen@complete.org>-Author: John Goerzen+Maintainer: Nicolas Wu <nicolas.wu@gmail.com>+Author: John Goerzen, Nicolas Wu Copyright: Copyright (c) 2009-2011 John Goerzen license-file: LICENSE extra-source-files: LICENSE, utils/genCinstances.hs,@@ -45,18 +45,14 @@ description: Build the executable to run unit tests default: False -flag time_gte_113- description: time > 1.1.3 has defined some more instances so omit them here- library if flag(splitBase)- Build-Depends: base>=3 && <5, old-time, time>=1.1.2.4,- bytestring, containers, old-locale- if flag(time_gte_113)- Build-Depends: time>=1.1.3- CPP-OPTIONS: -DTIME_GT_113- else- Build-Depends: time<1.1.3+ Build-Depends: base>=3 && <5,+ old-time,+ time>=1.1.3,+ bytestring,+ containers,+ old-locale else Build-Depends: base<3 Build-Depends: mtl, text >= 0.7@@ -83,12 +79,7 @@ Executable runtests if flag(buildtests) Buildable: True- Build-Depends: HUnit, QuickCheck >= 2.0, testpack >= 2.0- if flag(time_gte_113)- Build-Depends: time>=1.1.3- CPP-OPTIONS: -DTIME_GT_113- else- Build-Depends: time<1.1.3+ Build-Depends: HUnit, QuickCheck >= 2.0, testpack >= 2.0, time>=1.1.3 else Buildable: False Main-Is: runtests.hs