98634c9 · patch · git.iko.soy

git.iko.soy/patch

Appease hlint

commit98634c9cc7813ba2c2e8f070e0c31cb85b04aef4 authorJohn Ericson <git@JohnEricson.me> dateSat 11 Jan 2020, 19:54 (7 years ago) parentc99f2d2

3 files changed+8−12

compare with develop

unifiedsplit

src/Data/Patch/Class.hs+1−2 src/Data/Patch/DMapWithMove.hs+6−7 src/Data/Patch/DMapWithMove/By.hs+1−3

src/Data/Patch/Class.hs+1−2

@@ -1,5 +1,4 @@

11{-# LANGUAGE DefaultSignatures #-}

2−{-# LANGUAGE DeriveTraversable #-}

32{-# LANGUAGE DerivingStrategies #-}

43{-# LANGUAGE GeneralizedNewtypeDeriving #-}

54{-# LANGUAGE FlexibleInstances #-}

@@ -137,7 +136,7 @@ newtype ProjectLocal p from to = ProjectLocal { unProjectLocal :: p from to }

137136instance PatchHet2 p => PatchHet (ProjectLocal p from to) where

138137 type PatchSource (ProjectLocal p from to) = PatchSource1 p from

139138 type PatchTarget (ProjectLocal p from to) = PatchTarget1 p to

140− applyHet (ProjectLocal p) src = applyHet2 p src

139+ applyHet (ProjectLocal p) = applyHet2 p

141140

142141instance PatchHet2 p => PatchHet2Base (ProjectLocal p) where

143142 type PatchSource1 (ProjectLocal p) = PatchSource1 p

src/Data/Patch/DMapWithMove.hs+6−7

@@ -11,7 +11,6 @@

1111{-# LANGUAGE Rank2Types #-}

1212{-# LANGUAGE ScopedTypeVariables #-}

1313{-# LANGUAGE StandaloneDeriving #-}

14−{-# LANGUAGE TypeApplications #-}

1514{-# LANGUAGE TypeFamilies #-}

1615{-# LANGUAGE UndecidableInstances #-}

1716{-# LANGUAGE UndecidableSuperClasses #-}

@@ -440,7 +439,7 @@ mapPatchDMapWithMove f g (PatchDMapWithMove m) =

440439 h = \case

441440 From_Insert v -> From_Insert $ f v

442441 From_Delete -> From_Delete

443− From_Move (k :=> (Flip p)) -> From_Move $ k :=> Flip (g p)

442+ From_Move (k :=> Flip p) -> From_Move $ k :=> Flip (g p)

444443 j :: forall a. To k p a -> To k p' a

445444 j = \case

446445 To_NonMove -> To_NonMove

@@ -471,9 +470,9 @@ traversePatchDMapWithMoveWithKey

471470 -> PatchDMapWithMove k p

472471 -> m (PatchDMapWithMove k p')

473472traversePatchDMapWithMoveWithKey f g (PatchDMapWithMove m) =

474− fmap PatchDMapWithMove $ DMap.traverseWithKey (\k ni -> NodeInfo

475− <$> (h k $ _nodeInfo_from ni)

476− <*> (j k $ _nodeInfo_to ni)) m

473+ PatchDMapWithMove <$> DMap.traverseWithKey (\k ni -> NodeInfo

474+ <$> h k (_nodeInfo_from ni)

475+ <*> j k (_nodeInfo_to ni)) m

477476 where h :: forall a. k a -> From k p a -> m (From k p' a)

478477 h k = \case

479478 From_Insert v -> From_Insert <$> f k v

@@ -505,8 +504,8 @@ nodeInfoMapFromM

505504 -> NodeInfo k p a

506505 -> f (NodeInfo k p' a)

507506nodeInfoMapFromM f g ni = NodeInfo

508− <$> (f $ _nodeInfo_from ni)

509− <*> (g $ _nodeInfo_to ni)

507+ <$> f (_nodeInfo_from ni)

508+ <*> g (_nodeInfo_to ni)

510509

511510-- | Weaken a 'PatchDMapWithMove' to a 'PatchMapWithMove' by weakening the keys

512511-- from @k a@ to @'Some' k@ and applying a given weakening function

src/Data/Patch/DMapWithMove/By.hs+1−3

@@ -6,12 +6,10 @@

66{-# LANGUAGE InstanceSigs #-}

77{-# LANGUAGE LambdaCase #-}

88{-# LANGUAGE MultiParamTypeClasses #-}

9−{-# LANGUAGE PatternGuards #-}

109{-# LANGUAGE PolyKinds #-}

1110{-# LANGUAGE Rank2Types #-}

1211{-# LANGUAGE ScopedTypeVariables #-}

1312{-# LANGUAGE StandaloneDeriving #-}

14−{-# LANGUAGE TypeApplications #-}

1513{-# LANGUAGE TypeFamilies #-}

1614{-# LANGUAGE UndecidableInstances #-}

1715{-# LANGUAGE UndecidableSuperClasses #-}

@@ -59,7 +57,7 @@ deriving instance ( Ord (k from), Ord (k to)

5957

6058mapByPatch

6159 :: PatchTarget1 p0 ~ PatchTarget1 p1

62− => ((p0 from to) -> (p1 from to))

60+ => (p0 from to -> p1 from to)

6361 -> By k p0 from to

6462 -> By k p1 from to

6563mapByPatch f = \case