Skip to content

Commit 6ed5599

Browse files
mmhatmmhat
committed
Use microlens package family instead of lens-family-core
1 parent a5ca632 commit 6ed5599

37 files changed

+90
-77
lines changed

‎dhall-docs/dhall-docs.cabal

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ Library
7474
dhall >= 1.38.0 && < 1.43,
7575
file-embed >= 0.0.10.0 ,
7676
filepath >= 1.4 && < 1.6 ,
77-
lens-family-core >= 1.0.0 && < 2.2 ,
77+
microlens >= 0.4 && < 0.5 ,
7878
lucid >= 2.9.12 && < 2.12,
7979
mmark >= 0.0.7.0 && < 0.8 ,
8080
-- megaparsec follows SemVer: https://github.com/mrkkrp/megaparsec/issues/469#issuecomment-927918469

‎dhall-docs/src/Dhall/Docs/CodeRenderer.hs

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ import qualified Dhall.Core as Core
6464
import qualified Dhall.Map as Map
6565
import qualified Dhall.Parser
6666
import qualified Dhall.Pretty
67-
import qualified Lens.Family as Lens
67+
import qualified Lens.Micro as Lens
6868
import qualified Prettyprinter as Pretty
6969
import qualified Prettyprinter.Render.Text as Pretty.Text
7070
import qualified Text.Megaparsec.Pos as SourcePos

‎dhall-json/dhall-json.cabal

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ Library
4646
dhall >= 1.42.0 && < 1.43,
4747
exceptions >= 0.8.3 && < 0.11,
4848
filepath < 1.6 ,
49-
lens-family-core >= 1.0.0 && < 2.2 ,
49+
microlens >= 0.4 && < 0.5 ,
5050
optparse-applicative >= 0.14.0.0 && < 0.19,
5151
prettyprinter >= 1.7.0 && < 1.8 ,
5252
scientific >= 0.3.0.0 && < 0.4 ,

‎dhall-json/src/Dhall/JSON.hs

+1-1
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ import qualified Dhall.Parser
246246
import qualified Dhall.Pretty
247247
import qualified Dhall.TypeCheck
248248
import qualified Dhall.Util
249-
import qualified Lens.Family as Lens
249+
import qualified Lens.Micro as Lens
250250
import qualified Options.Applicative
251251
import qualified Prettyprinter.Render.Text as Pretty
252252
import qualified System.FilePath

‎dhall-json/src/Dhall/JSONToDhall.hs

+2-2
Original file line numberDiff line numberDiff line change
@@ -376,6 +376,7 @@ import Data.Void (Void)
376376
import Dhall.Core (Chunks (..), DhallDouble (..), Expr (App))
377377
import Dhall.JSON.Util (pattern FA, pattern V)
378378
import Dhall.Parser (Src)
379+
import Lens.Micro (rewriteOf)
379380
import Options.Applicative (Parser)
380381

381382
import qualified Data.Aeson as Aeson
@@ -393,7 +394,6 @@ import qualified Dhall.Import
393394
import qualified Dhall.JSON.Compat as JSON.Compat
394395
import qualified Dhall.Lint as Lint
395396
import qualified Dhall.Map as Map
396-
import qualified Dhall.Optics as Optics
397397
import qualified Dhall.Parser
398398
import qualified Dhall.TypeCheck as D
399399
import qualified Options.Applicative as O
@@ -803,7 +803,7 @@ Right (RecordLit (fromList [("foo",IntegerLit 1)]))
803803
dhallFromJSON
804804
:: Conversion -> ExprX -> Value -> Either CompileError ExprX
805805
dhallFromJSON (Conversion {..}) expressionType =
806-
fmap (Optics.rewriteOf D.subExpressions Lint.useToMap) . loop [] (D.alphaNormalize (D.normalize expressionType))
806+
fmap (rewriteOf D.subExpressions Lint.useToMap) . loop [] (D.alphaNormalize (D.normalize expressionType))
807807
where
808808
loop :: Aeson.Types.JSONPath -> ExprX -> Aeson.Value -> Either CompileError ExprX
809809
-- any ~> Union

‎dhall-nix/dhall-nix.cabal

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Library
3131
data-fix < 0.4 ,
3232
dhall >= 1.42 && < 1.43,
3333
hnix >= 0.16 && < 0.18,
34-
lens-family-core >= 1.0.0 && < 2.2 ,
34+
microlens >= 0.4 && < 0.5 ,
3535
neat-interpolation < 0.6 ,
3636
text >= 0.8.0.0 && < 2.2
3737
Exposed-Modules:

‎dhall-nix/src/Dhall/Nix.hs

+2-4
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
{-# LANGUAGE OverloadedStrings #-}
55
{-# LANGUAGE QuasiQuotes #-}
66
{-# LANGUAGE RecordWildCards #-}
7-
{-# LANGUAGE TemplateHaskell #-}
87
{-# LANGUAGE TypeFamilies #-}
98
{-# LANGUAGE ViewPatterns #-}
109

@@ -103,7 +102,7 @@ import qualified Data.Text as Text
103102
import Data.Traversable (for)
104103
import Data.Typeable (Typeable)
105104
import Data.Void (Void, absurd)
106-
import Lens.Family (toListOf)
105+
import Lens.Micro (toListOf, rewriteOf)
107106
import Numeric (showHex)
108107
import Data.Char (ord, isDigit, isAsciiLower, isAsciiUpper)
109108

@@ -151,7 +150,6 @@ import Nix.Expr
151150
import qualified Data.Text
152151
import qualified Dhall.Core
153152
import qualified Dhall.Map
154-
import qualified Dhall.Optics
155153
import qualified Dhall.Pretty
156154
import qualified NeatInterpolation
157155
import qualified Nix
@@ -336,7 +334,7 @@ dhallToNix e =
336334

337335
-- Even higher-level utility that renames all shadowed references
338336
rewriteShadowed =
339-
Dhall.Optics.rewriteOf Dhall.Core.subExpressions renameShadowed
337+
rewriteOf Dhall.Core.subExpressions renameShadowed
340338

341339
loop (Const _) = return untranslatable
342340
loop (Var (V a 0)) = return (Nix.mkSym (zEncodeSymbol a))

‎dhall-nixpkgs/Main.hs

+3-3
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,8 @@ import Dhall.Crypto (SHA256Digest (..))
8484
import Dhall.Import (Status (..), stack)
8585
import Dhall.Parser (Src)
8686
import GHC.Generics (Generic)
87-
import Lens.Family.State.Strict (zoom)
87+
import Lens.Micro (rewriteOf)
88+
import Lens.Micro.Mtl (zoom)
8889
import Network.URI (URI (..), URIAuth (..))
8990
import Nix.Expr.Shorthands ((@.), (@@))
9091
import Nix.Expr.Types (NExpr)
@@ -117,7 +118,6 @@ import qualified Data.Text.Encoding as Text.Encoding
117118
import qualified Data.Text.IO as Text.IO
118119
import qualified Dhall.Core
119120
import qualified Dhall.Import
120-
import qualified Dhall.Optics
121121
import qualified Dhall.Parser
122122
import qualified GHC.IO.Encoding
123123
import qualified NeatInterpolation
@@ -341,7 +341,7 @@ findExternalDependencies expression = do
341341

342342
let rewrittenExpression :: Expr Src Import
343343
rewrittenExpression =
344-
Dhall.Optics.rewriteOf Dhall.Core.subExpressions pickAlt expression
344+
rewriteOf Dhall.Core.subExpressions pickAlt expression
345345

346346
import_ <- lift (Turtle.select (Foldable.toList rewrittenExpression))
347347

‎dhall-nixpkgs/dhall-nixpkgs.cabal

+2-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ Executable dhall-to-nixpkgs
2525
, dhall >= 1.42.0 && < 1.43
2626
, foldl < 1.5
2727
, hnix >= 0.10.1 && < 0.18
28-
, lens-family-core >= 1.0.0 && < 2.2
28+
, microlens >= 0.4 && < 0.5
29+
, microlens-mtl >= 0.1 && < 0.3
2930
-- megaparsec follows SemVer: https://github.com/mrkkrp/megaparsec/issues/469#issuecomment-927918469
3031
, megaparsec >= 7.0.0 && < 10
3132
, mmorph < 1.3

‎dhall-openapi/dhall-openapi.cabal

+1
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ Library
8181
containers >= 0.5.8.0 && < 0.8 ,
8282
dhall >= 1.38.0 && < 1.43 ,
8383
prettyprinter >= 1.7.0 && < 1.8 ,
84+
microlens >= 0.4 && < 0.5 ,
8485
scientific >= 0.3.0.0 && < 0.4 ,
8586
sort >= 1.0 && < 1.1 ,
8687
text >= 0.11.1.0 && < 2.2 ,

‎dhall-openapi/src/Dhall/Kubernetes/Convert.hs

+7-7
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import GHC.Generics (Generic, Rep)
2424

2525
import qualified Data.Char as Char
2626
import qualified Data.List as List
27+
import qualified Data.Map as Map
2728
import qualified Data.Map.Strict as Data.Map
2829
import qualified Data.Maybe as Maybe
2930
import qualified Data.Set as Set
@@ -32,8 +33,7 @@ import qualified Data.Text as Text
3233
import qualified Data.Tuple as Tuple
3334
import qualified Dhall.Core as Dhall
3435
import qualified Dhall.Map
35-
import qualified Dhall.Optics
36-
import qualified Data.Map as Map
36+
import qualified Lens.Micro as Lens
3737

3838
modelsToText :: ModelHierarchy -> [Text]
3939
modelsToText = List.map (\ (ModelName unModelName) -> unModelName)
@@ -141,7 +141,7 @@ mergeNoConflicts :: (Ord k, Eq a, Show a, Show k) => (a -> a -> Bool) -> Data.Ma
141141
mergeNoConflicts canMerge = Data.Map.unionWithKey
142142
(\key left right ->
143143
if canMerge left right
144-
then left
144+
then left
145145
else error ("Cannot merge differing values " ++ show left ++ " and " ++ show right ++ " for key " ++ show key))
146146

147147
{- | Extract the 'ModelName' to be used when splitting a definition.
@@ -164,7 +164,7 @@ guessModelNameForSplit models definition = ModelName <$> ((<>) <$> toPrepend <*>
164164
'modelsToPath'. If a 'ModelName' is provided as a value for the given path, it will be returned (to be then used as
165165
the 'ModelName' for the nested definition. If no 'ModelName' is provided, 'guessModelNameForSplit' will try to guess.
166166
If that fails, 'Nothing' will be returned such that no split will be done by 'toTypes'
167-
167+
168168
Currently not all split points in for nested definitions are supported (in fact only types with a properties
169169
attribute are currently supported).
170170
-}
@@ -215,7 +215,7 @@ toTypes' prefixMap typeSplitter preferNaturalInt natIntExceptions definitions to
215215
(expr, leftOverDefs) = (convertToType (modelHierarchy ++ [k]) v (isException /= preferNaturalInt))
216216

217217
(newDefs, modelMap) = Data.Map.mapAccumWithKey (convertAndAccumWithKey []) Data.Map.empty definitions
218-
218+
219219
kvList = Dhall.App Dhall.List $ Dhall.Record $ Dhall.Map.fromList
220220
[ ("mapKey", Dhall.makeRecordField Dhall.Text), ("mapValue", Dhall.makeRecordField Dhall.Text) ]
221221

@@ -233,7 +233,7 @@ toTypes' prefixMap typeSplitter preferNaturalInt natIntExceptions definitions to
233233
shouldBeRequired hierarchy field = Set.member field requiredNames
234234
where
235235
requiredNames = requiredFields hierarchy (required definition)
236-
236+
237237
(newPropDefs, propModelMap) = Data.Map.mapAccumWithKey (convertAndAccumWithKey modelHierarchy) Data.Map.empty props
238238

239239
(required', optional') = Data.Map.partitionWithKey
@@ -325,7 +325,7 @@ toDefault prefixMap definitions modelName = go
325325
let expression = Dhall.App Dhall.None _T
326326

327327
let adjustedExpression =
328-
Dhall.Optics.transformOf
328+
Lens.transformOf
329329
Dhall.subExpressions
330330
adjustImport
331331
expression

‎dhall/dhall.cabal

+2-1
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,8 @@ Common common
229229
haskeline >= 0.7.2.1 && < 0.9 ,
230230
hashable >= 1.2 && < 1.6 ,
231231
indexed-traversable < 0.2 ,
232-
lens-family-core >= 1.0.0 && < 2.2 ,
232+
microlens >= 0.4 && < 0.5 ,
233+
microlens-mtl >= 0.1 && < 0.3 ,
233234
-- megaparsec follows SemVer: https://github.com/mrkkrp/megaparsec/issues/469#issuecomment-927918469
234235
megaparsec >= 8 && < 10 ,
235236
mmorph < 1.3 ,

‎dhall/src/Dhall.hs

+6-5
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,8 @@ import Dhall.Parser (Src (..))
6969
import Dhall.Syntax (Expr (..), Import)
7070
import Dhall.TypeCheck (DetailedTypeError (..), TypeError)
7171
import GHC.Generics
72-
import Lens.Family (LensLike', view)
72+
import Lens.Micro (LensLike')
73+
import Lens.Micro.Extras (view)
7374
import Prelude hiding (maybe, sequence)
7475
import System.FilePath (takeDirectory)
7576

@@ -83,7 +84,7 @@ import qualified Dhall.Parser
8384
import qualified Dhall.Pretty.Internal
8485
import qualified Dhall.Substitution
8586
import qualified Dhall.TypeCheck
86-
import qualified Lens.Family
87+
import qualified Lens.Micro as Lens
8788

8889
import Dhall.Marshal.Decode
8990
import Dhall.Marshal.Encode
@@ -278,9 +279,9 @@ resolveAndStatusWithSettings settings expression = do
278279
let EvaluateSettings{..} = _evaluateSettings
279280

280281
let transform =
281-
Lens.Family.set Dhall.Import.substitutions _substitutions
282-
. Lens.Family.set Dhall.Import.normalizer _normalizer
283-
. Lens.Family.set Dhall.Import.startingContext _startingContext
282+
Lens.set Dhall.Import.substitutions _substitutions
283+
. Lens.set Dhall.Import.normalizer _normalizer
284+
. Lens.set Dhall.Import.startingContext _startingContext
284285

285286
let status = transform (Dhall.Import.emptyStatusWithManager _newManager _rootDirectory)
286287

‎dhall/src/Dhall/Core.hs

+1-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ import Dhall.Pretty.Internal
8787
import Dhall.Src (Src (..))
8888
import Dhall.Syntax
8989
import Instances.TH.Lift ()
90-
import Lens.Family (over)
90+
import Lens.Micro (over)
9191
import Prettyprinter (Pretty)
9292

9393
import qualified Control.Exception

‎dhall/src/Dhall/Freeze.hs

+4-3
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,8 @@ import Dhall.Util
4949
, Transitivity (..)
5050
, handleMultipleChecksFailed
5151
)
52-
import Lens.Family (set, view)
52+
import Lens.Micro (set, transformOf)
53+
import Lens.Micro.Extras (view)
5354
import System.Console.ANSI (hSupportsANSI)
5455

5556
import qualified Control.Exception as Exception
@@ -433,9 +434,9 @@ freezeExpressionWithSettings settings directory scope intent expression = do
433434
| import1 == import2 = Embed import1
434435
simplify expression_ = expression_
435436

436-
Dhall.Optics.transformOf Core.subExpressions simplify <$> case intent of
437+
transformOf Core.subExpressions simplify <$> case intent of
437438
Secure ->
438-
traverse freezeFunction (Dhall.Optics.transformOf Core.subExpressions uncache expression)
439+
traverse freezeFunction (transformOf Core.subExpressions uncache expression)
439440
Cache ->
440441
Dhall.Optics.transformMOf Core.subExpressions cache expression
441442

‎dhall/src/Dhall/Import.hs

+1-1
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ import Dhall.Parser
210210
, SourcedException (..)
211211
, Src (..)
212212
)
213-
import Lens.Family.State.Strict (zoom)
213+
import Lens.Micro.Mtl (zoom)
214214

215215
import qualified Codec.CBOR.Write as Write
216216
import qualified Codec.Serialise

‎dhall/src/Dhall/Import/Types.hs

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import Dhall.Core
2323
)
2424
import Dhall.Map (Map)
2525
import Dhall.Parser (Src)
26-
import Lens.Family (LensLike')
26+
import Lens.Micro (LensLike')
2727
import Prettyprinter (Pretty (..))
2828

2929
#ifdef WITH_HTTP

‎dhall/src/Dhall/Lint.hs

+4-4
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ module Dhall.Lint
2020

2121
import Control.Applicative ((<|>))
2222

23+
import Dhall.Optics (anyOf)
2324
import Dhall.Syntax
2425
( Binding (..)
2526
, Chunks (..)
@@ -40,8 +41,7 @@ import qualified Data.List.NonEmpty as NonEmpty
4041
import qualified Data.Text as Text
4142
import qualified Dhall.Core as Core
4243
import qualified Dhall.Map
43-
import qualified Dhall.Optics
44-
import qualified Lens.Family
44+
import qualified Lens.Micro as Lens
4545

4646
{-| Automatically improve a Dhall expression
4747
@@ -53,7 +53,7 @@ import qualified Lens.Family
5353
* fixes paths of the form @.\/..\/foo@ to @..\/foo@
5454
-}
5555
lint :: Eq s => Expr s Import -> Expr s Import
56-
lint = Dhall.Optics.rewriteOf subExpressions rewrite
56+
lint = Lens.rewriteOf subExpressions rewrite
5757
where
5858
rewrite e =
5959
fixAssert e
@@ -144,7 +144,7 @@ addPreludeExtensions _ = Nothing
144144

145145
isOrContainsAssert :: Expr s a -> Bool
146146
isOrContainsAssert (Assert _) = True
147-
isOrContainsAssert e = Lens.Family.anyOf subExpressions isOrContainsAssert e
147+
isOrContainsAssert e = anyOf subExpressions isOrContainsAssert e
148148

149149
-- | The difference between
150150
--

‎dhall/src/Dhall/Main.hs

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ import Dhall.Pretty
4848
import Dhall.Schemas (Schemas (..))
4949
import Dhall.TypeCheck (Censored (..), DetailedTypeError (..), TypeError)
5050
import Dhall.Version (dhallVersionString)
51-
import Lens.Family (set)
51+
import Lens.Micro (set)
5252
import Options.Applicative (Parser, ParserInfo)
5353
import Prettyprinter (Doc, Pretty)
5454
import System.Exit (ExitCode, exitFailure)

‎dhall/src/Dhall/Normalize.hs

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ import qualified Data.Text as Text
4848
import qualified Dhall.Eval as Eval
4949
import qualified Dhall.Map
5050
import qualified Dhall.Syntax as Syntax
51-
import qualified Lens.Family as Lens
51+
import qualified Lens.Micro as Lens
5252

5353
{-| Returns `True` if two expressions are α-equivalent and β-equivalent and
5454
`False` otherwise

0 commit comments

Comments
 (0)