Switch Wrapper.PSQ from OrdPSQ to HashablePSQ.

1 files changed, 8 insertions, 6 deletions

diff --git a/src/Data/Wrapper/PSQ.hs b/src/Data/Wrapper/PSQ.hs
index 7e14008b..54365a1d 100644
--- a/src/Data/Wrapper/PSQ.hs
+++ b/src/Data/Wrapper/PSQ.hs
@@ -3,11 +3,13 @@
 {-# LANGUAGE ConstraintKinds #-}
 module Data.Wrapper.PSQ
 #if 0
-     ( module Data.PSQueue ) where
+     ( module Data.Wrapper.PSQ , module Data.PSQueue ) where
 
 import Data.PSQueue hiding (foldr, foldl)
 import qualified Data.PSQueue as PSQueue
 
+type PSQKey k = (Ord k)
+
 -- | Wrapper over PSQueue-style foldr to implement a psqueues-style interface.
 fold' :: (Ord k, Ord p) => (k -> p -> () -> a -> a) -> a -> PSQ k p -> a
 fold' f a q = PSQueue.foldr f' a q
@@ -15,19 +17,19 @@ fold' f a q = PSQueue.foldr f' a q
     f' (k :-> prio) x = f k prio () x
 
 #else
-    ( module Data.Wrapper.PSQ , module OrdPSQ ) where
+    ( module Data.Wrapper.PSQ , module HashPSQ ) where
 
 import Data.OrdPSQ as OrdPSQ hiding (insert, map, singleton, minView)
-import qualified Data.OrdPSQ as Q
+import qualified Data.OrdPSQ as OrdPSQ
 
 import Data.HashPSQ as HashPSQ hiding (insert, map, singleton, minView)
-import qualified Data.HashPSQ as HashPSQ
+import qualified Data.HashPSQ as Q
 import Data.Hashable
 
-type PSQ k p = OrdPSQ k p ()
+type PSQ k p = HashPSQ k p ()
 type Binding k p = (k,p,())
 
-type PSQKey k = (Ord k)
+type PSQKey k = (Hashable k, Ord k)
 
 pattern (:->) :: k -> p -> Binding k p
 pattern k :-> p <- (k,p,()) where k :-> p = (k,p,())