Get rid of a warning, make tests pass

commercialhaskell · Aug 9, 2018 · 71c79e4 · 71c79e4
1 parent 4f6c663
commit 71c79e4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/subs/pantry/src/Pantry/Types.hs b/subs/pantry/src/Pantry/Types.hs
@@ -822,6 +822,7 @@ instance FromJSON (WithJSONWarnings UnresolvedPackageLocationImmutable) where
         -- if subdirs exists, it needs to be valid
         case HM.lookup "subdirs" o of
           Just v' -> do
+            tellJSONField "subdirs"
             subdirs <- lift $ parseJSON v'
             case subdirs of
               [] -> fail "Invalid empty subdirs"

diff --git a/subs/pantry/test/Pantry/BuildPlanSpec.hs b/subs/pantry/test/Pantry/BuildPlanSpec.hs
@@ -16,10 +16,10 @@ spec =
   describe "PackageLocation" $ do
     describe "Archive" $ do
       describe "github" $ do
-        let decode' :: MonadThrow m => ByteString -> m (WithJSONWarnings UnresolvedPackageLocationImmutable)
+        let decode' :: (HasCallStack, MonadThrow m) => ByteString -> m (WithJSONWarnings UnresolvedPackageLocationImmutable)
             decode' = decodeThrow
 
-            decode'' :: ByteString -> IO [PackageLocationImmutable]
+            decode'' :: HasCallStack => ByteString -> IO [PackageLocationImmutable]
             decode'' bs = do
               WithJSONWarnings unresolved warnings <- decode' bs
               unless (null warnings) $ error $ show warnings