git.iko.soy/typeable/stackage2nix
on master help sign in
Cleanup warnings
commit3be632eb3a1d3a49325f93c9c2704c3af3cfb293 authorDmitry Bushev <bushevdv@gmail.com> dateWed 25 Jul 2018, 19:01 (8 years ago) parenta1e6083
5 files changed+9−10
compare with master
unifiedsplit
src/AllCabalHashes.hs−1 src/Distribution/Nixpkgs/Haskell/FromStack/Package.hs−1 src/Stack/Config.hs+1−3 test/Stack/Config/YamlSpec.hs+7−4 test/Stack/ConfigSpec.hs+1−1
src/AllCabalHashes.hs−1
@@ -6,7 +6,6 @@ import Data.ByteString as BS
66import Data.ByteString.Lazy as BSL
77import Data.Map as M
88import Data.Text as T
9−import Data.Text.Encoding as T
109import Distribution.Nixpkgs.Hashes as NH
1110import Distribution.Package
1211import Distribution.PackageDescription
src/Distribution/Nixpkgs/Haskell/FromStack/Package.hs−1
@@ -5,7 +5,6 @@ import Data.Foldable as F
55import Data.Function (on)
66import Data.Graph (Graph, Vertex)
77import Data.Maybe
8−import Data.Monoid
98import Data.Ord as O
109import Distribution.Text (display, disp)
1110import Distribution.Package (unPackageName, packageName)
src/Stack/Config.hs+1−3
@@ -3,13 +3,11 @@
33module Stack.Config where
44
55import Control.Lens
6−import Data.Bifunctor
76import Data.ByteString as BS
87import Data.Coerce
98import Data.List as L
109import Data.List.NonEmpty as NE
1110import Data.Maybe
12−import Data.Semigroup
1311import Data.Text as T
1412import Data.Yaml
1513import Network.URI
@@ -192,4 +190,4 @@ readStackConfig stackYaml = do
192190 mkStackConfig = over (scPackages . traversed . spLocation) relativeToStackYaml
193191 . over (scExtraDeps . traversed . spLocation) relativeToStackYaml
194192 . fromYamlConfig
195− second mkStackConfig . decodeEither <$> BS.readFile (stackYaml ^. syFilePath)
193+ bimap show mkStackConfig . decodeEither' <$> BS.readFile (stackYaml ^. syFilePath)
test/Stack/Config/YamlSpec.hs+7−4
@@ -1,7 +1,7 @@
11{-# LANGUAGE OverloadedStrings #-}
22{-# LANGUAGE QuasiQuotes #-}
33
4−module Stack.Config.YamlSpec where
4+module Stack.Config.YamlSpec (spec) where
55
66import Data.ByteString
77import Data.Text.Encoding as T
@@ -150,8 +150,11 @@ configNew = Config
150150spec :: Spec
151151spec = describe "Config" $ do
152152 specify "minimal" $
153− (Y.decode configYamlMinimal :: Maybe Config) `shouldBe` Just configMinimal
153+ (decodeMaybe configYamlMinimal :: Maybe Config) `shouldBe` Just configMinimal
154154 specify "full" $
155− (Y.decode configYaml :: Maybe Config) `shouldBe` Just config
155+ (decodeMaybe configYaml :: Maybe Config) `shouldBe` Just config
156156 specify "new" $
157− (Y.decode configNewYaml :: Maybe Config) `shouldBe` Just configNew
157+ (decodeMaybe configNewYaml :: Maybe Config) `shouldBe` Just configNew
158+
159+decodeMaybe :: ByteString -> Maybe Config
160+decodeMaybe = either (const Nothing) id . Y.decodeEither'
test/Stack/ConfigSpec.hs+1−1
@@ -31,7 +31,7 @@ spec = describe "StackConfig" $ do
3131 $ checkYamlConfig packageExtraDepsNewBs packageExtraDepsNewConf
3232
3333parseYamlConfig :: ByteString -> Maybe StackConfig
34−parseYamlConfig = fmap fromYamlConfig . Y.decode
34+parseYamlConfig = either (const Nothing) (Just . fromYamlConfig) . Y.decodeEither'
3535
3636checkYamlConfig :: ByteString -> StackConfig -> Expectation
3737checkYamlConfig bs sc = parseYamlConfig bs `shouldBe` Just sc