Fix testing hls-graph

Author: wz1000

hls-graph/src/Development/IDE/Graph/Internal/Types.hs

@@ -140,7 +140,7 @@ renderKey :: Key -> Text
 renderKey (lookupKeyValue -> KeyValue _ t) = t
 
 newtype KeySet = KeySet IntSet
-  deriving (Eq, Ord, Semigroup, Monoid)
+  deriving newtype (Eq, Ord, Semigroup, Monoid)
 
 instance Show KeySet where
   showsPrec p (KeySet is)= showParen (p > 10) $
@@ -178,7 +178,7 @@ lengthKeySet :: KeySet -> Int
 lengthKeySet = coerce IS.size
 
 newtype KeyMap a = KeyMap (IntMap a)
-  deriving (Eq, Ord, Semigroup, Monoid)
+  deriving newtype (Eq, Ord, Semigroup, Monoid)
 
 instance Show a => Show (KeyMap a) where
   showsPrec p (KeyMap im)= showParen (p > 10) $

hls-graph/test/ActionSpec.hs

@@ -43,8 +43,8 @@ spec = do
         pure $ do
           apply1 theKey
       res `shouldBe` [True]
-      Just (Clean res) <- lookup (Key theKey) <$> getDatabaseValues theDb
-      resultDeps res `shouldBe` ResultDeps [Key (Rule @())]
+      Just (Clean res) <- lookup (newKey theKey) <$> getDatabaseValues theDb
+      resultDeps res `shouldBe` ResultDeps (singletonKeySet $ newKey (Rule @()))
     it "tracks reverse dependencies" $ do
       db@(ShakeDatabase _ _ Database {..}) <- shakeNewDatabase shakeOptions $ do
         ruleUnit
@@ -54,8 +54,8 @@ spec = do
         pure $ do
           apply1 theKey
       res `shouldBe` [True]
-      Just KeyDetails {..} <- atomically $ STM.lookup (Key (Rule @())) databaseValues
-      keyReverseDeps `shouldBe` HashSet.fromList [Key theKey]
+      Just KeyDetails {..} <- atomically $ STM.lookup (newKey (Rule @())) databaseValues
+      keyReverseDeps `shouldBe` (singletonKeySet $ newKey theKey)
     it "rethrows exceptions" $ do
       db <- shakeNewDatabase shakeOptions $ do
         addRule $ \(Rule :: Rule ()) old mode -> error "boom"
@@ -74,5 +74,5 @@ spec = do
         pure $ do
           applyWithoutDependency [theKey]
       res `shouldBe` [[True]]
-      Just (Clean res) <- lookup (Key theKey) <$> getDatabaseValues theDb
+      Just (Clean res) <- lookup (newKey theKey) <$> getDatabaseValues theDb
       resultDeps res `shouldBe` UnknownDeps