summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDaniel Gröber <dxld@darkboxed.org>2013-12-01 21:19:35 +0100
committerDaniel Gröber <dxld@darkboxed.org>2013-12-01 21:19:35 +0100
commit5dc7a19e42da1ee1cc3570ca74a55c32d7d243e0 (patch)
tree5472de9cdb8afd6b15752f796ece829bf9e0316a /src
parentb83c5d53be21c03004ebb65d1dc9fe1f841a2a3c (diff)
Fix building with hashable >= 1.2
hashWithSalt is now the minimal implementation
Diffstat (limited to 'src')
-rw-r--r--src/Data/Torrent.hs4
-rw-r--r--src/Data/Torrent/InfoHash.hs4
-rw-r--r--src/Network/BitTorrent/Core/PeerId.hs4
3 files changed, 6 insertions, 6 deletions
diff --git a/src/Data/Torrent.hs b/src/Data/Torrent.hs
index 7469d621..ce919907 100644
--- a/src/Data/Torrent.hs
+++ b/src/Data/Torrent.hs
@@ -137,8 +137,8 @@ instance NFData InfoDict where
137 rnf InfoDict {..} = rnf idLayoutInfo 137 rnf InfoDict {..} = rnf idLayoutInfo
138 138
139instance Hashable InfoDict where 139instance Hashable InfoDict where
140 hash = Hashable.hash . idInfoHash 140 hashWithSalt = Hashable.hashUsing idInfoHash
141 {-# INLINE hash #-} 141 {-# INLINE hashWithSalt #-}
142 142
143-- | Smart constructor: add a info hash to info dictionary. 143-- | Smart constructor: add a info hash to info dictionary.
144infoDictionary :: LayoutInfo -> PieceInfo -> Bool -> InfoDict 144infoDictionary :: LayoutInfo -> PieceInfo -> Bool -> InfoDict
diff --git a/src/Data/Torrent/InfoHash.hs b/src/Data/Torrent/InfoHash.hs
index d840ac87..4d49fcb7 100644
--- a/src/Data/Torrent/InfoHash.hs
+++ b/src/Data/Torrent/InfoHash.hs
@@ -70,8 +70,8 @@ instance Default InfoHash where
70 70
71-- | Hash raw bytes. (no encoding) 71-- | Hash raw bytes. (no encoding)
72instance Hashable InfoHash where 72instance Hashable InfoHash where
73 hash (InfoHash ih) = Hashable.hash ih 73 hashWithSalt s (InfoHash ih) = hashWithSalt s ih
74 {-# INLINE hash #-} 74 {-# INLINE hashWithSalt #-}
75 75
76-- | Convert to\/from raw bencoded string. (no encoding) 76-- | Convert to\/from raw bencoded string. (no encoding)
77instance BEncode InfoHash where 77instance BEncode InfoHash where
diff --git a/src/Network/BitTorrent/Core/PeerId.hs b/src/Network/BitTorrent/Core/PeerId.hs
index 148f550d..1b4409a8 100644
--- a/src/Network/BitTorrent/Core/PeerId.hs
+++ b/src/Network/BitTorrent/Core/PeerId.hs
@@ -74,8 +74,8 @@ peerIdLen :: Int
74peerIdLen = 20 74peerIdLen = 20
75 75
76instance Hashable PeerId where 76instance Hashable PeerId where
77 hash = hash . getPeerId 77 hashWithSalt = hashUsing getPeerId
78 {-# INLINE hash #-} 78 {-# INLINE hashWithSalt #-}
79 79
80instance Serialize PeerId where 80instance Serialize PeerId where
81 put = putByteString . getPeerId 81 put = putByteString . getPeerId