move U.Util.Lens from unison-util to unison-prelude (renamed to Unison.Util.Lens)

codebase2/codebase-sqlite/U/Codebase/Sqlite/Queries.hs

@@ -275,12 +275,12 @@ import qualified U.Util.Hash as Hash
 import U.Util.Hash32 (Hash32)
 import qualified U.Util.Hash32 as Hash32
 import U.Util.Hash32.Orphans.Sqlite ()
-import qualified U.Util.Lens as Lens
 import qualified U.Util.Serialization as S
 import qualified U.Util.Term as TermUtil
 import Unison.Prelude
 import Unison.Sqlite
 import qualified Unison.Util.Alternative as Alternative
+import qualified Unison.Util.Lens as Lens
 
 -- * main squeeze
 

codebase2/util/unison-util.cabal

@@ -18,7 +18,6 @@ library
   exposed-modules:
       U.Util.Cache
       U.Util.Components
-      U.Util.Lens
       U.Util.Monoid
       U.Util.String
       U.Util.Text

lib/unison-prelude/package.yaml

@@ -14,14 +14,14 @@ dependencies:
   - containers
   - either
   - extra
+  - lens
   - mtl
+  - pretty-simple
   - safe
   - text
   - transformers
-  - lens
-  - vector
   - unliftio
-  - pretty-simple
+  - vector
   - witherable
 
 ghc-options:
@@ -30,6 +30,7 @@ ghc-options:
 default-extensions:
   - ApplicativeDo
   - BlockArguments
+  - ConstraintKinds
   - DeriveFunctor
   - DerivingStrategies
   - DoAndIfThenElse

lib/unison-prelude/src/Unison/Util/Lens.hs

@@ -1,6 +1,10 @@
-{-# LANGUAGE ConstraintKinds #-}
-
-module U.Util.Lens where
+module Unison.Util.Lens
+  ( Field1',
+    Field2',
+    Field3',
+    Field4',
+  )
+where
 
 import qualified Control.Lens as Lens
 

lib/unison-prelude/unison-prelude.cabal

@@ -20,6 +20,7 @@ library
       Unison.Debug
       Unison.Prelude
       Unison.Util.Alternative
+      Unison.Util.Lens
       Unison.Util.Map
       Unison.Util.Monoid
       Unison.Util.Set
@@ -28,6 +29,7 @@ library
   default-extensions:
       ApplicativeDo
       BlockArguments
+      ConstraintKinds
       DeriveFunctor
       DerivingStrategies
       DoAndIfThenElse