summaryrefslogtreecommitdiff
authorBryanOSullivan <>2012-12-17 20:17:25 (GMT)
committer hdiff <hdiff@hdiff.luite.com>2012-12-17 20:17:25 (GMT)
commit63dc6219b02237c1e7d8e2c28334762a053b7165 (patch) (side-by-side diff)
tree3a96bd3d2efa1b29450d5437ee7b3fe683e9e5e4
parentd04351cb3b970d733d5c8e663b821e7da6b16a77 (diff)
version 0.2.0.20.2.0.2
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Data/Configurator/Types/Internal.hs8
-rw-r--r--configurator.cabal2
2 files changed, 5 insertions, 5 deletions
diff --git a/Data/Configurator/Types/Internal.hs b/Data/Configurator/Types/Internal.hs
index 7c6f2c4..d34a659 100644
--- a/Data/Configurator/Types/Internal.hs
+++ b/Data/Configurator/Types/Internal.hs
@@ -46,7 +46,7 @@ import qualified Data.HashMap.Lazy as H
data Worth a = Required { worth :: a }
| Optional { worth :: a }
deriving (Show, Typeable)
-
+
instance IsString (Worth FilePath) where
fromString = Required
@@ -54,7 +54,7 @@ instance (Eq a) => Eq (Worth a) where
a == b = worth a == worth b
instance (Hashable a) => Hashable (Worth a) where
- hash = hash . worth
+ hashWithSalt salt v = hashWithSalt salt (worth v)
-- | Global configuration data. This is the top-level config from which
-- 'Config' values are derived by choosing a root location.
@@ -119,8 +119,8 @@ instance IsString Pattern where
| otherwise = Exact (T.pack s)
instance Hashable Pattern where
- hash (Exact n) = hash n
- hash (Prefix n) = hash n
+ hashWithSalt salt (Exact n) = hashWithSalt salt n
+ hashWithSalt salt (Prefix n) = hashWithSalt salt n
-- | This class represents types that can be automatically and safely
-- converted /from/ a 'Value' /to/ a destination type. If conversion
diff --git a/configurator.cabal b/configurator.cabal
index 0e4604a..a56912c 100644
--- a/configurator.cabal
+++ b/configurator.cabal
@@ -1,5 +1,5 @@
name: configurator
-version: 0.2.0.1
+version: 0.2.0.2
license: BSD3
license-file: LICENSE
category: Configuration, Data