ehmry/dhall-haskell
ehmry/dhall-haskell
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use lens-family-core instead of lens (#238)

Browse Source 
Related to https://github.com/fpco/stackage/issues/3238

The immediate motivation of this change is to fix the upper bound issue
linked above.  However, since we don't need the full `lens` dependency
this uses the much smaller and more stable `lens-family-core` library.  Besides
reducing the footprint of the `dhall` executable this should hopefully also
reduce the number times we need to update the upper bound.
This commit is contained in:
Gabriel Gonzalez 2018-01-29 09:28:20 -08:00 committed by GitHub
parent 8d16e6b87d
commit 5fa4fae85a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
default.nix
View File

@ -1,9 +1,9 @@
{ mkDerivation, ansi-wl-pprint, base, base16-bytestring, bytestring { mkDerivation, ansi-wl-pprint, base, base16-bytestring, bytestring
, case-insensitive, charset, containers, contravariant, cryptohash , case-insensitive, charset, containers, contravariant, cryptohash
, deepseq, exceptions, http-client, http-client-tls, lens , deepseq, exceptions, http-client, http-client-tls
, optparse-generic, parsers, prettyprinter, stdenv, system-fileio , lens-family-core, optparse-generic, parsers, prettyprinter
, system-filepath, tasty, tasty-hunit, text, text-format , stdenv, system-fileio, system-filepath, tasty, tasty-hunit, text
, transformers, trifecta, unordered-containers, vector , text-format, transformers, trifecta, unordered-containers, vector
}: }:
mkDerivation { mkDerivation {
pname = "dhall"; pname = "dhall";
@ -14,9 +14,9 @@ mkDerivation {
libraryHaskellDepends = [ libraryHaskellDepends = [
ansi-wl-pprint base base16-bytestring bytestring case-insensitive ansi-wl-pprint base base16-bytestring bytestring case-insensitive
charset containers contravariant cryptohash exceptions http-client charset containers contravariant cryptohash exceptions http-client
http-client-tls lens parsers prettyprinter system-fileio http-client-tls lens-family-core parsers prettyprinter
system-filepath text text-format transformers trifecta system-fileio system-filepath text text-format transformers
unordered-containers vector trifecta unordered-containers vector
]; ];
executableHaskellDepends = [ executableHaskellDepends = [
base optparse-generic prettyprinter system-filepath text trifecta base optparse-generic prettyprinter system-filepath text trifecta

2
dhall.cabal
View File

@ -105,7 +105,7 @@ Library
exceptions >= 0.8.3 && < 0.9 , exceptions >= 0.8.3 && < 0.9 ,
http-client >= 0.4.30 && < 0.6 , http-client >= 0.4.30 && < 0.6 ,
http-client-tls >= 0.2.0 && < 0.4 , http-client-tls >= 0.2.0 && < 0.4 ,
lens >= 2.4 && < 4.16, lens-family-core >= 1.0.0 && < 1.3 ,
parsers >= 0.12.4 && < 0.13, parsers >= 0.12.4 && < 0.13,
prettyprinter >= 1.1.1 && < 1.2 , prettyprinter >= 1.1.1 && < 1.2 ,
system-filepath >= 0.3.1 && < 0.5 , system-filepath >= 0.3.1 && < 0.5 ,

9
src/Dhall/Import.hs
View File

@ -118,7 +118,6 @@ module Dhall.Import (
import Control.Applicative (empty) import Control.Applicative (empty)
import Control.Exception import Control.Exception
(Exception, IOException, SomeException, onException, throwIO) (Exception, IOException, SomeException, onException, throwIO)
import Control.Lens (Lens', zoom)
import Control.Monad (join) import Control.Monad (join)
import Control.Monad.Catch (throwM, MonadCatch(catch)) import Control.Monad.Catch (throwM, MonadCatch(catch))
import Control.Monad.IO.Class (MonadIO(..)) import Control.Monad.IO.Class (MonadIO(..))
@ -147,6 +146,8 @@ import Dhall.Core
) )
import Dhall.Parser (Parser(..), ParseError(..), Src(..)) import Dhall.Parser (Parser(..), ParseError(..), Src(..))
import Dhall.TypeCheck (X(..)) import Dhall.TypeCheck (X(..))
import Lens.Family (LensLike')
import Lens.Family.State.Strict (zoom)
#if MIN_VERSION_http_client(0,5,0) #if MIN_VERSION_http_client(0,5,0)
import Network.HTTP.Client import Network.HTTP.Client
(HttpException(..), HttpExceptionContent(..), Manager) (HttpException(..), HttpExceptionContent(..), Manager)
@ -346,13 +347,13 @@ emptyStatus = Status [] Map.empty Nothing
canonicalizeAll :: [Path] -> [Path] canonicalizeAll :: [Path] -> [Path]
canonicalizeAll = map canonicalizePath . List.tails canonicalizeAll = map canonicalizePath . List.tails
stack :: Lens' Status [Path] stack :: Functor f => LensLike' f Status [Path]
stack k s = fmap (\x -> s { _stack = x }) (k (_stack s)) stack k s = fmap (\x -> s { _stack = x }) (k (_stack s))
cache :: Lens' Status (Map Path (Expr Src X)) cache :: Functor f => LensLike' f Status (Map Path (Expr Src X))
cache k s = fmap (\x -> s { _cache = x }) (k (_cache s)) cache k s = fmap (\x -> s { _cache = x }) (k (_cache s))
manager :: Lens' Status (Maybe Manager) manager :: Functor f => LensLike' f Status (Maybe Manager)
manager k s = fmap (\x -> s { _manager = x }) (k (_manager s)) manager k s = fmap (\x -> s { _manager = x }) (k (_manager s))
needManager :: StateT Status IO Manager needManager :: StateT Status IO Manager