Skip to content

Commit

Permalink
Fix linter warnings and unit tests
Browse files Browse the repository at this point in the history
  • Loading branch information
akshaymankar committed Jun 18, 2019
1 parent ff84257 commit 5d63f6a
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions src/Stack/Dot.hs
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ createDependencyGraph dotOpts = do
| name `elem` [mkPackageName "rts", mkPackageName "ghc"] =
return (Set.empty, DotPayload (Just version) (Just $ Right BSD3) Nothing)
| otherwise =
fmap (packageAllDeps &&& (makePayload loc)) (loadPackage loc flags ghcOptions cabalConfigOpts)
fmap (packageAllDeps &&& makePayload loc) (loadPackage loc flags ghcOptions cabalConfigOpts)
resolveDependencies (dotDependencyDepth dotOpts) graph depLoader
where makePayload loc pkg = DotPayload (Just $ packageVersion pkg) (Just $ packageLicense pkg) (Just $ PLImmutable loc)

Expand Down Expand Up @@ -177,7 +177,7 @@ dependencyToJSON pkg (_, payload) = let fieldsAlwaysPresent = [ "name" .= packa
, "license" .= licenseText payload
, "version" .= versionText payload
]
loc = catMaybes [("location" .=) <$> pkgLocToJSON <$> payloadLocation payload]
loc = catMaybes [("location" .=) . pkgLocToJSON <$> payloadLocation payload]
in object $ fieldsAlwaysPresent ++ loc

pkgLocToJSON :: PackageLocation -> Value
Expand Down
2 changes: 1 addition & 1 deletion src/test/Stack/DotSpec.hs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import Test.QuickCheck (forAll,choose,Gen)
import Stack.Dot

dummyPayload :: DotPayload
dummyPayload = DotPayload (parseVersion "0.0.0.0") (Just (Right BSD3))
dummyPayload = DotPayload (parseVersion "0.0.0.0") (Just (Right BSD3)) Nothing

spec :: Spec
spec = do
Expand Down

0 comments on commit 5d63f6a

Please sign in to comment.