dc33205 · jrec · git.iko.soy

git.iko.soy/jrec

Run ormolu

commitdc33205da210be42c789882f62948fde2b6d8845 authorSridhar Ratnakumar <srid@srid.ca> dateSun 2 Aug 2020, 13:39 (6 years ago) parent187646c

3 files changed+8−8

compare with master

unifiedsplit

src/JRec.hs+1−2 src/JRec/Super.hs+7−5 test/Spec.hs−1

src/JRec.hs+1−2

@@ -13,8 +13,8 @@ where

1313

1414import Control.Lens ((&), (.~), (^.), coerced)

1515import qualified "generic-lens" Data.Generics.Product.Fields as GL

16−import qualified "generic-lens" Data.Generics.Wrapped as GL

1716import qualified "generic-optics" Data.Generics.Product.Fields as GO

17+import qualified "generic-lens" Data.Generics.Wrapped as GL

1818import qualified "generic-optics" Data.Generics.Wrapped as GO

1919import Data.Proxy

2020import GHC.Exts (Any)

@@ -102,7 +102,6 @@ instance {-# OVERLAPPING #-} (R.Set field fields a' ~ fields', R.Set field field

102102instance {-# OVERLAPPING #-} (R.Set field fields a ~ fields, R.Has field fields a) => GO.HasField' field (Rec fields) a where

103103 field' = R.opticLens (R.FldProxy @field)

104104

105−

106105pattern Rec ::

107106 ( RecTuple tuple fields

108107 ) =>

src/JRec/Super.hs+7−5

@@ -89,11 +89,13 @@ data Rec (lts :: [*]) = MkRec

8989

9090type role Rec representational

9191

92−instance

93− ( RecApply lts lts Show,

92+instance

93+ ( RecApply lts lts Show,

9494 GShow Proxy (Rep (Rec lts)),

9595 Generic (Rec lts)

96− ) => Show (Rec lts) where

96+ ) =>

97+ Show (Rec lts)

98+ where

9799 show = (\x -> if null x then "{}" else x) . unwords . drop 1 . words . flip (gshowsPrec 0) ""

98100

99101instance RecEq lts lts => Eq (Rec lts) where

@@ -661,8 +663,8 @@ lens lbl f r =

661663 fmap (\v -> set lbl v r) (f (get lbl r))

662664{-# INLINE lens #-}

663665

664−opticLens ::

665− (Has l lts v, Set l lts v' ~ lts') => FldProxy l -> OL.Lens (Rec lts) (Rec lts') v v'

666+opticLens ::

667+ (Has l lts v, Set l lts v' ~ lts') => FldProxy l -> OL.Lens (Rec lts) (Rec lts') v v'

666668opticLens lbl =

667669 OL.lensVL $ lens lbl

668670{-# INLINE opticLens #-}

test/Spec.hs−1

@@ -1,2 +1 @@

11{-# OPTIONS_GHC -F -pgmF hspec-discover #-}

2−