3 files changed, 18 insertions, 14 deletions

diff --git a/src/Data/Torrent/Block.hs b/src/Data/Torrent/Block.hs
index fd12b7a0..089217fa 100644
--- a/src/Data/Torrent/Block.hs
+++ b/src/Data/Torrent/Block.hs
@@ -7,9 +7,11 @@
 --
 --   Blocks are used to transfer pieces.
 --
-{-# LANGUAGE GeneralizedNewtypeDeriving #-}
-{-# LANGUAGE TemplateHaskell            #-}
 {-# LANGUAGE FlexibleInstances          #-}
+{-# LANGUAGE TemplateHaskell            #-}
+{-# LANGUAGE DeriveFunctor              #-}
+{-# LANGUAGE DeriveDataTypeable         #-}
+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
 module Data.Torrent.Block
        ( -- * Piece attributes
          PieceIx
@@ -38,6 +40,7 @@ import qualified Data.ByteString.Lazy as Lazy
 import Data.Char
 import Data.List as L
 import Data.Serialize as S
+import Data.Typeable
 import Text.PrettyPrint
 import Text.PrettyPrint.Class
 
@@ -95,7 +98,7 @@ data BlockIx = BlockIx {
 
     -- | Block size starting from offset.
   , ixLength :: {-# UNPACK #-} !BlockSize
-  } deriving (Show, Eq)
+  } deriving (Show, Eq, Typeable)
 
 $(deriveJSON defaultOptions { fieldLabelModifier = (L.map toLower . L.dropWhile isLower) } ''BlockIx)
 
@@ -148,7 +151,7 @@ data Block payload = Block {
 
     -- | Payload bytes.
   , blkData   :: !payload
-  } deriving (Show, Eq)
+  } deriving (Show, Eq, Functor, Typeable)
 
 -- | Payload is ommitted.
 instance Pretty (Block Lazy.ByteString) where
diff --git a/src/Data/Torrent/Layout.hs b/src/Data/Torrent/Layout.hs
index d39c6c04..c1e26d48 100644
--- a/src/Data/Torrent/Layout.hs
+++ b/src/Data/Torrent/Layout.hs
@@ -50,7 +50,7 @@ module Data.Torrent.Layout
        , blockCount
 
          -- * Flat file layout
-       , Layout
+       , FileLayout
        , flatLayout
        , accumOffsets
        , fileOffset
@@ -286,13 +286,13 @@ blockCount blkSize ci = contentLength ci `sizeInBase` blkSize
 --   coalesce all the files in the given order to get the linear block
 --   address space.
 --
-type Layout a = [(FilePath, a)]
+type FileLayout a = [(FilePath, a)]
 
 -- | Extract files layout from torrent info with the given root path.
 flatLayout
-  :: FilePath        -- ^ Root path for the all torrent files.
-  -> LayoutInfo      -- ^ Torrent content information.
-  -> Layout FileSize -- ^ The all file paths prefixed with the given root.
+  :: FilePath            -- ^ Root path for the all torrent files.
+  -> LayoutInfo          -- ^ Torrent content information.
+  -> FileLayout FileSize -- ^ The all file paths prefixed with the given root.
 flatLayout prefixPath SingleFile { liFile = FileInfo {..} }
     = [(prefixPath </> BC.unpack fiName, fiLength)]
 flatLayout prefixPath MultiFile  {..}     = L.map mkPath liFiles
@@ -303,14 +303,14 @@ flatLayout prefixPath MultiFile  {..}     = L.map mkPath liFiles
            </> joinPath (L.map BC.unpack fiName)
 
 -- | Calculate offset of each file based on its length, incrementally.
-accumOffsets :: Layout FileSize -> Layout FileOffset
+accumOffsets :: FileLayout FileSize -> FileLayout FileOffset
 accumOffsets = go 0
   where
     go !_ [] = []
     go !offset ((n, s) : xs) = (n, offset) : go (offset + s) xs
 
 -- | Gives global offset of a content file for a given full path.
-fileOffset :: FilePath -> Layout FileOffset -> Maybe FileOffset
+fileOffset :: FilePath -> FileLayout FileOffset -> Maybe FileOffset
 fileOffset = lookup
 {-# INLINE fileOffset #-}
 
diff --git a/src/Data/Torrent/Piece.hs b/src/Data/Torrent/Piece.hs
index f7c6257b..31680ce8 100644
--- a/src/Data/Torrent/Piece.hs
+++ b/src/Data/Torrent/Piece.hs
@@ -7,8 +7,9 @@
 --
 --   Pieces are used to validate torrent content.
 --
-{-# LANGUAGE TemplateHaskell    #-}
-{-# LANGUAGE DeriveDataTypeable #-}
+{-# LANGUAGE TemplateHaskell            #-}
+{-# LANGUAGE DeriveDataTypeable         #-}
+{-# LANGUAGE DeriveFunctor              #-}
 {-# LANGUAGE GeneralizedNewtypeDeriving #-}
 module Data.Torrent.Piece
        ( -- * Piece attributes
@@ -115,7 +116,7 @@ data Piece a = Piece
 
     -- | Payload.
   , pieceData  :: !a
-  } deriving (Show, Read, Eq, Typeable)
+  } deriving (Show, Read, Eq, Functor, Typeable)
 
 $(deriveJSON defaultOptions { fieldLabelModifier =  (L.map toLower . L.dropWhile isLower) } ''Piece)