filediff 0.1.0.0 → 0.1.0.1

raw patch · 3 files changed

+13/−7 lines, 3 filesPVP: minor bump suggested

API additions: PVP suggests at least a minor version bump

API changes (from Hackage documentation)

+ Filediff.Sequence: instance Constructor C1_0SeqDiff

+ Filediff.Sequence: instance Datatype D1SeqDiff

+ Filediff.Sequence: instance Generic (SeqDiff a)

+ Filediff.Sequence: instance Selector S1_0_0SeqDiff

+ Filediff.Sequence: instance Selector S1_0_1SeqDiff

+ Filediff.Types: instance Constructor C1_0Diff

+ Filediff.Types: instance Constructor C1_0Filediff

+ Filediff.Types: instance Datatype D1Diff

+ Filediff.Types: instance Datatype D1Filediff

+ Filediff.Types: instance Generic Diff

+ Filediff.Types: instance Generic Filediff

+ Filediff.Types: instance Selector S1_0_0Diff

+ Filediff.Types: instance Selector S1_0_0Filediff

+ Filediff.Types: instance Selector S1_0_1Filediff

+ Filediff.Types: instance Selector S1_0_2Filediff

Files

filediff.cabal +4/−4
src/Filediff/Sequence.hs +4/−1
src/Filediff/Types.hs +5/−2

filediff.cabal view

@@ -1,10 +1,10 @@--- Initial filediff.cabal generated by cabal init.  For further +-- Initial Filediff.cabal generated by cabal init.  For further  -- documentation, see http://haskell.org/cabal/users-guide/  name:                filediff-version:             0.1.0.0-synopsis:            Diff and patch module-description:         A library for creating and applying diffs. Diffs can be manipulated in code in between creation and application.+version:             0.1.0.1+synopsis:            Diffing and patching module+description:         `filediff` is a Haskell library for creating diffs, and applying diffs to files and directories. homepage:            https://github.com/bgwines/filediff license:             BSD3 license-file:        LICENSE

src/Filediff/Sequence.hs view

@@ -1,4 +1,5 @@ {-# LANGUAGE ScopedTypeVariables #-}+{-# LANGUAGE DeriveGeneric #-} {-# LANGUAGE InstanceSigs #-} {-# LANGUAGE FlexibleInstances #-} {-# LANGUAGE TypeSynonymInstances #-}@@ -13,6 +14,8 @@ , applySequenceDiff ) where +import GHC.Generics+ import Data.MemoCombinators.Class (MemoTable, table) import qualified Data.MemoCombinators as Memo @@ -30,7 +33,7 @@ data SeqDiff a = SeqDiff {       dels :: [Int]     , adds :: [(Int, a)] }-    deriving (Show, Eq)+    deriving (Show, Eq, Generic)  instance (Eq a, MemoTable a) => Monoid (SeqDiff a) where     mempty :: SeqDiff a

src/Filediff/Types.hs view

@@ -1,4 +1,5 @@ {-# LANGUAGE InstanceSigs #-}+{-# LANGUAGE DeriveGeneric #-}  -- | Data types used by `Filediff` module Filediff.Types@@ -8,6 +9,8 @@ , Error ) where +import GHC.Generics+ import qualified Data.Text as T  import Data.List (intersect, sortBy)@@ -29,7 +32,7 @@     base :: FilePath,     comp :: FilePath,     linediff :: SeqDiff Line-} deriving (Eq, Show)+} deriving (Eq, Show, Generic)  -- TODO: is this mathematically correct? instance Monoid Filediff where@@ -49,7 +52,7 @@ data Diff = Diff {     -- relative to directories being diffed     filediffs :: [Filediff]-} deriving (Show)+} deriving (Show, Generic)  instance Eq Diff where     (==) :: Diff -> Diff -> Bool