Skip to content

Commit 46c76f6

Browse files
author
Poscat
committed
improve formatting
1 parent 332a05e commit 46c76f6

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

src/Data/Aeson/Types/FromJSON.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1454,7 +1454,7 @@ instance (RecordFromJSON arity f, FieldNames f) => FromTaggedFlatObject' arity f
14541454
instance FromTaggedFlatObject' arity U1 False where
14551455
parseTaggedFlatObject' _ _ = Tagged (pure U1)
14561456

1457-
instance OVERLAPPABLE_ (PositionFromObject 1 arity f) => FromTaggedFlatObject' arity f False where
1457+
instance PositionFromObject 1 arity f => FromTaggedFlatObject' arity f False where
14581458
parseTaggedFlatObject' (_ :* p) obj = Tagged (positionFromObject (Proxy :: Proxy 1) p obj)
14591459

14601460
class KnownNat n => PositionFromObject n arity f where

src/Data/Aeson/Types/ToJSON.hs

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -954,17 +954,23 @@ instance RecordToPairs pairs enc arity f => TaggedFlatObject' pairs enc arity f
954954
instance Monoid pairs => TaggedFlatObject' enc pairs arity U1 False where
955955
taggedFlatObject' _ _ _ = Tagged mempty
956956

957-
instance OVERLAPPABLE_ (PositionToPairs 1 pairs enc arity f) => TaggedFlatObject' enc pairs arity f False where
957+
instance PositionToPairs 1 pairs enc arity f => TaggedFlatObject' enc pairs arity f False where
958958
taggedFlatObject' opts targs a = Tagged $ positionToPairs (Proxy :: Proxy 1) opts targs a
959959

960960
class KnownNat n => PositionToPairs n pairs enc arity f where
961961
positionToPairs :: Proxy n -> Options -> ToArgs enc arity a -> f a -> pairs
962962

963-
instance (KeyValuePair enc pairs, GToJSON' enc arity a, KnownNat n) => PositionToPairs n pairs enc arity (S1 m a) where
963+
instance ( KeyValuePair enc pairs
964+
, GToJSON' enc arity a
965+
, KnownNat n
966+
) => PositionToPairs n pairs enc arity (S1 m a) where
964967
positionToPairs p opts targs (M1 a) =
965968
show (natVal p) `pair` gToJSON opts targs a
966969

967-
instance (Semigroup pairs, PositionToPairs n pairs enc arity f, PositionToPairs (n+1) pairs enc arity g) => PositionToPairs n pairs enc arity (f :*: g) where
970+
instance ( Semigroup pairs
971+
, PositionToPairs n pairs enc arity f
972+
, PositionToPairs (n+1) pairs enc arity g
973+
) => PositionToPairs n pairs enc arity (f :*: g) where
968974
positionToPairs _ opts targs (f :*: g) =
969975
positionToPairs (Proxy :: Proxy n) opts targs f
970976
<> positionToPairs (Proxy :: Proxy (n+1)) opts targs g

0 commit comments

Comments
 (0)