Skip to content

Fromjson1 th generics backup no orphans #415

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 7, 2016
Merged

Fromjson1 th generics backup no orphans #415

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ed2162a
Un-orphan instances
phadej Jun 6, 2016
88a4dd9
Remove old-locale flag
phadej Jun 6, 2016
7cb9ac8
Generics and TH support for lifted typeclasses
RyanGlScott Mar 24, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion Data/Aeson.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,14 @@ module Data.Aeson
, GFromJSON(..)
, GToJSON(..)
, GToEncoding(..)
, Zero
, One
, genericToJSON
, genericLiftToJSON
, genericToEncoding
, genericLiftToEncoding
, genericParseJSON
, genericLiftParseJSON
, defaultOptions

-- * Inspecting @'Value's@
Expand All @@ -103,12 +108,12 @@ module Data.Aeson
, json'
) where

import Data.Aeson.Types.FromJSON (ifromJSON)
import Data.Aeson.Encode (encode)
import Data.Aeson.Parser.Internal (decodeWith, decodeStrictWith,
eitherDecodeWith, eitherDecodeStrictWith,
jsonEOF, json, jsonEOF', json')
import Data.Aeson.Types
import Data.Aeson.Types.Instances (ifromJSON)
import Data.Aeson.Types.Internal (JSONPath, formatError)
import qualified Data.ByteString as B
import qualified Data.ByteString.Lazy as L
Expand Down
3 changes: 1 addition & 2 deletions Data/Aeson/Encode/Functions.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,5 @@ import Data.Aeson.Types.Class
import Data.ByteString.Builder (Builder)
import Data.Monoid ((<>))

builder :: ToJSON a => a -> Builder
builder = fromEncoding . toEncoding

{-# INLINE builder #-}
2 changes: 1 addition & 1 deletion Data/Aeson/Internal.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,5 @@ module Data.Aeson.Internal
, iparse
) where

import Data.Aeson.Types.Instances (ifromJSON)
import Data.Aeson.Types.Internal
import Data.Aeson.Types.FromJSON (ifromJSON)
Loading