98634c9 · patch · git.iko.soy

git.iko.soy/patch

on develop help sign in

Appease hlint

98634c9John Ericson7 years ago

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

compare with develop

unifiedsplit

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

1{-# LANGUAGE DefaultSignatures #-}

2−{-# LANGUAGE DeriveTraversable #-}

3{-# LANGUAGE DerivingStrategies #-}

2{-# LANGUAGE DerivingStrategies #-}

4{-# LANGUAGE GeneralizedNewtypeDeriving #-}

3{-# LANGUAGE GeneralizedNewtypeDeriving #-}

5{-# LANGUAGE FlexibleInstances #-}

4{-# LANGUAGE FlexibleInstances #-}

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

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

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

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

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

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

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

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

139+ applyHet (ProjectLocal p) = applyHet2 p

141

140

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

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

143 type PatchSource1 (ProjectLocal p) = PatchSource1 p

142 type PatchSource1 (ProjectLocal p) = PatchSource1 p

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

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

11{-# LANGUAGE Rank2Types #-}

12{-# LANGUAGE ScopedTypeVariables #-}

13{-# LANGUAGE StandaloneDeriving #-}

14−{-# LANGUAGE TypeApplications #-}

15{-# LANGUAGE TypeFamilies #-}

14{-# LANGUAGE TypeFamilies #-}

16{-# LANGUAGE UndecidableInstances #-}

15{-# LANGUAGE UndecidableInstances #-}

17{-# LANGUAGE UndecidableSuperClasses #-}

16{-# LANGUAGE UndecidableSuperClasses #-}

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

440 h = \case

439 h = \case

441 From_Insert v -> From_Insert $ f v

440 From_Insert v -> From_Insert $ f v

442 From_Delete -> From_Delete

441 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)

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

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

445 j = \case

444 j = \case

446 To_NonMove -> To_NonMove

445 To_NonMove -> To_NonMove

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

471 -> PatchDMapWithMove k p

470 -> PatchDMapWithMove k p

472 -> m (PatchDMapWithMove k p')

471 -> m (PatchDMapWithMove k p')

473traversePatchDMapWithMoveWithKey f g (PatchDMapWithMove m) =

472traversePatchDMapWithMoveWithKey f g (PatchDMapWithMove m) =

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

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

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

474+ <$> h k (_nodeInfo_from ni)

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

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

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

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

478 h k = \case

477 h k = \case

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

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

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

505 -> NodeInfo k p a

504 -> NodeInfo k p a

506 -> f (NodeInfo k p' a)

505 -> f (NodeInfo k p' a)

507nodeInfoMapFromM f g ni = NodeInfo

506nodeInfoMapFromM f g ni = NodeInfo

508− <$> (f $ _nodeInfo_from ni)

507+ <$> f (_nodeInfo_from ni)

509− <*> (g $ _nodeInfo_to ni)

508+ <*> g (_nodeInfo_to ni)

510

509

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

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

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

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

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

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

6{-# LANGUAGE InstanceSigs #-}

7{-# LANGUAGE LambdaCase #-}

8{-# LANGUAGE MultiParamTypeClasses #-}

9−{-# LANGUAGE PatternGuards #-}

10{-# LANGUAGE PolyKinds #-}

9{-# LANGUAGE PolyKinds #-}

11{-# LANGUAGE Rank2Types #-}

10{-# LANGUAGE Rank2Types #-}

12{-# LANGUAGE ScopedTypeVariables #-}

11{-# LANGUAGE ScopedTypeVariables #-}

13{-# LANGUAGE StandaloneDeriving #-}

12{-# LANGUAGE StandaloneDeriving #-}

14−{-# LANGUAGE TypeApplications #-}

15{-# LANGUAGE TypeFamilies #-}

13{-# LANGUAGE TypeFamilies #-}

16{-# LANGUAGE UndecidableInstances #-}

14{-# LANGUAGE UndecidableInstances #-}

17{-# LANGUAGE UndecidableSuperClasses #-}

15{-# LANGUAGE UndecidableSuperClasses #-}

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

60mapByPatch

58mapByPatch

61 :: PatchTarget1 p0 ~ PatchTarget1 p1

59 :: PatchTarget1 p0 ~ PatchTarget1 p1

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

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

63 -> By k p0 from to

61 -> By k p0 from to

64 -> By k p1 from to

62 -> By k p1 from to

65mapByPatch f = \case

63mapByPatch f = \case