hexagoxel
/
brittany
1
0
Fork 0
Code Issues 117 Pull Requests 5 Packages Projects Releases 5 Wiki Activity

Remove unordered-containers direct dependency

pull/35/head
Lennart Spitzner 2017-05-25 13:12:11 +02:00
parent bdc85eb744
commit 91429ccacc
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
brittany.cabal
View File

@ -108,7 +108,6 @@ library {
, semigroups >=0.18.2 && <0.19 , semigroups >=0.18.2 && <0.19
, cmdargs >=0.10.14 && <0.11 , cmdargs >=0.10.14 && <0.11
, czipwith >=1.0.0.0 && <1.1 , czipwith >=1.0.0.0 && <1.1
, unordered-containers >=0.2.7 && <0.3
, ghc-boot-th >=8.0.1 && <8.1 , ghc-boot-th >=8.0.1 && <8.1
} }
default-extensions: { default-extensions: {
@ -170,7 +169,6 @@ executable brittany
, semigroups , semigroups
, cmdargs , cmdargs
, czipwith , czipwith
, unordered-containers
, ghc-boot-th , ghc-boot-th
, hspec >=2.4.1 && <2.5 , hspec >=2.4.1 && <2.5
, filepath >=1.4.1.0 && <1.5 , filepath >=1.4.1.0 && <1.5
@ -249,7 +247,6 @@ test-suite unittests
, semigroups , semigroups
, cmdargs , cmdargs
, czipwith , czipwith
, unordered-containers
, ghc-boot-th , ghc-boot-th
, hspec >=2.4.1 && <2.5 , hspec >=2.4.1 && <2.5
} }
@ -324,7 +321,6 @@ test-suite littests
, semigroups , semigroups
, cmdargs , cmdargs
, czipwith , czipwith
, unordered-containers
, ghc-boot-th , ghc-boot-th
, hspec >=2.4.1 && <2.5 , hspec >=2.4.1 && <2.5
, parsec >=3.1.11 && <3.2 , parsec >=3.1.11 && <3.2

3
src/Language/Haskell/Brittany/Internal/Config/Types.hs
View File

@ -13,7 +13,6 @@ where
import Data.Yaml import Data.Yaml
import qualified Data.Aeson.Types as Aeson import qualified Data.Aeson.Types as Aeson
import qualified Data.HashMap.Lazy as HML
import GHC.Generics import GHC.Generics
import Data.Data ( Data ) import Data.Data ( Data )
@ -257,7 +256,7 @@ instance FromJSON (CConfig Maybe) where
-- Pretends that the value is {} when the key is not present. -- Pretends that the value is {} when the key is not present.
(.:?=) :: FromJSON a => Object -> Text -> Parser a (.:?=) :: FromJSON a => Object -> Text -> Parser a
o .:?= k = o .:? k >>= maybe (parseJSON (Object HML.empty)) pure o .:?= k = o .:? k >>= maybe (parseJSON (Aeson.object [])) pure
data IndentPolicy = IndentPolicyLeft -- never create a new indentation at more data IndentPolicy = IndentPolicyLeft -- never create a new indentation at more
-- than old indentation + amount -- than old indentation + amount