@@ -4,7 +4,7 @@ module Main where
44
55--------------------------------------------------------------------------------
66
7−import Criterion.Main
7+import Criterion.Main hiding (defaultOptions)
88
99import Control.DeepSeq (NFData, rnf, deepseq)
1010
@@ -51,10 +51,10 @@ instance ToJSON a => ToJSON (D a)
5151instance FromJSON a => FromJSON (D a)
5252
5353thDToJSON :: ToJSON a => D a -> Value
54−thDToJSON = $(mkToJSON id ''D)
54+thDToJSON = $(mkToJSON defaultOptions ''D)
5555
5656thDParseJSON :: FromJSON a => Value -> Parser (D a)
57−thDParseJSON = $(mkParseJSON id ''D)
57+thDParseJSON = $(mkParseJSON defaultOptions ''D)
5858
5959thDFromJSON :: FromJSON a => Value -> Result (D a)
6060thDFromJSON = parse thDParseJSON
@@ -81,10 +81,10 @@ instance ToJSON BigRecord
8181instance FromJSON BigRecord
8282
8383thBigRecordToJSON :: BigRecord -> Value
84−thBigRecordToJSON = $(mkToJSON id ''BigRecord)
84+thBigRecordToJSON = $(mkToJSON defaultOptions ''BigRecord)
8585
8686thBigRecordParseJSON :: Value -> Parser BigRecord
87−thBigRecordParseJSON = $(mkParseJSON id ''BigRecord)
87+thBigRecordParseJSON = $(mkParseJSON defaultOptions ''BigRecord)
8888
8989thBigRecordFromJSON :: Value -> Result BigRecord
9090thBigRecordFromJSON = parse thBigRecordParseJSON
@@ -111,10 +111,10 @@ instance ToJSON BigProduct
111111instance FromJSON BigProduct
112112
113113thBigProductToJSON :: BigProduct -> Value
114−thBigProductToJSON = $(mkToJSON id ''BigProduct)
114+thBigProductToJSON = $(mkToJSON defaultOptions ''BigProduct)
115115
116116thBigProductParseJSON :: Value -> Parser BigProduct
117−thBigProductParseJSON = $(mkParseJSON id ''BigProduct)
117+thBigProductParseJSON = $(mkParseJSON defaultOptions ''BigProduct)
118118
119119thBigProductFromJSON :: Value -> Result BigProduct
120120thBigProductFromJSON = parse thBigProductParseJSON
@@ -136,10 +136,10 @@ instance ToJSON BigSum
136136instance FromJSON BigSum
137137
138138thBigSumToJSON :: BigSum -> Value
139−thBigSumToJSON = $(mkToJSON id ''BigSum)
139+thBigSumToJSON = $(mkToJSON defaultOptions ''BigSum)
140140
141141thBigSumParseJSON :: Value -> Parser BigSum
142−thBigSumParseJSON = $(mkParseJSON id ''BigSum)
142+thBigSumParseJSON = $(mkParseJSON defaultOptions ''BigSum)
143143
144144thBigSumFromJSON :: Value -> Result BigSum
145145thBigSumFromJSON = parse thBigSumParseJSON
@@ -192,7 +192,9 @@ main = defaultMain
192192 ]
193193 ]
194194
195−group n th syb gen = bgroup n [ bench "th" th
196− , bench "syb" syb
197− , bench "generic" gen
198− ]
195+group n th syb gen = bcompare
196+ [ bgroup n [ bench "th" th
197+ , bench "syb" syb
198+ , bench "generic" gen
199+ ]
200+ ]