summaryrefslogtreecommitdiff
path: root/Key.hs
diff options
context:
space:
mode:
authorJoeyHess <>2018-04-27 16:38:00 (GMT)
committerhdiff <hdiff@hdiff.luite.com>2018-04-27 16:38:00 (GMT)
commitce1a9785a12bedd6cafb8eed7584322aed1f2af9 (patch)
tree4f0ed4f416e3030972614bae900687d2f6245fa0 /Key.hs
parentf10229ad862d18e0f3c78360b1a848baa0c38335 (diff)
version 6.201804276.20180427
Diffstat (limited to 'Key.hs')
-rw-r--r--Key.hs6
1 files changed, 3 insertions, 3 deletions
diff --git a/Key.hs b/Key.hs
index 44e9ace..ade012a 100644
--- a/Key.hs
+++ b/Key.hs
@@ -22,7 +22,6 @@ module Key (
prop_isomorphic_key_decode
) where
-import Data.Aeson
import Data.Char
import qualified Data.Text as T
@@ -30,6 +29,7 @@ import Common
import Types.Key
import Utility.QuickCheck
import Utility.Bloom
+import Utility.Aeson
import qualified Utility.SimpleProtocol as Proto
stubKey :: Key
@@ -155,8 +155,8 @@ instance Hashable Key where
hashIO32 = hashIO32 . key2file
hashIO64 = hashIO64 . key2file
-instance ToJSON Key where
- toJSON = toJSON . key2file
+instance ToJSON' Key where
+ toJSON' = toJSON' . key2file
instance FromJSON Key where
parseJSON (String t) = maybe mempty pure $ file2key $ T.unpack t