Permalink
Browse files

Merge branch 'master' of git://github.com/mailrank/aeson into optimiz…

…ations

Also removed some unnecessary language extensions
Conflicts:
	Data/Aeson/Types/Internal.hs
  • Loading branch information...
basvandijk committed Nov 4, 2011
2 parents 72814fa + b465c0d commit ebd766e747f4fc147ec76b3b6170dbb5ae93227a
Showing with 1,037 additions and 961 deletions.
  1. +1 −1 Data/Aeson/Generic.hs
  2. +7 −0 Data/Aeson/Types.hs
  3. +732 −0 Data/Aeson/Types/Class.hs
  4. +285 −0 Data/Aeson/Types/Generic.hs
  5. +5 −956 Data/Aeson/Types/Internal.hs
  6. +7 −4 aeson.cabal
View
@@ -1,4 +1,4 @@
-{-# LANGUAGE PatternGuards, RankNTypes, ScopedTypeVariables #-}
+{-# LANGUAGE PatternGuards, Rank2Types, ScopedTypeVariables #-}
-- |
-- Module: Data.Aeson.Generic
View
@@ -1,3 +1,5 @@
+{-# LANGUAGE CPP #-}
+
-- |
-- Module: Data.Aeson.Types
-- Copyright: (c) 2011 MailRank, Inc.
@@ -36,4 +38,9 @@ module Data.Aeson.Types
, object
) where
+import Data.Aeson.Types.Class
import Data.Aeson.Types.Internal
+
+#ifdef GENERICS
+import Data.Aeson.Types.Generic ()
+#endif
Oops, something went wrong.

0 comments on commit ebd766e

Please sign in to comment.