merge unison-util-nametree into unison-core1

sellout · Jul 2, 2024 · eb1ee64 · eb1ee64
1 parent 71eed21
commit eb1ee64
Show file tree

Hide file tree

Showing 16 changed files with 21 additions and 141 deletions.
diff --git a/codebase2/codebase-sqlite/package.yaml b/codebase2/codebase-sqlite/package.yaml
@@ -31,6 +31,7 @@ dependencies:
   - unison-codebase
   - unison-codebase-sync
   - unison-core
+  - unison-core1
   - unison-core-orphans-sqlite
   - unison-hash
   - unison-hash-orphans-sqlite
@@ -39,7 +40,6 @@ dependencies:
   - unison-util-base32hex
   - unison-util-cache
   - unison-util-file-embed
-  - unison-util-nametree
   - unison-util-serialization
   - unison-util-term
   - unliftio

diff --git a/codebase2/codebase-sqlite/unison-codebase-sqlite.cabal b/codebase2/codebase-sqlite/unison-codebase-sqlite.cabal
@@ -126,14 +126,14 @@ library
     , unison-codebase-sync
     , unison-core
     , unison-core-orphans-sqlite
+    , unison-core1
     , unison-hash
     , unison-hash-orphans-sqlite
     , unison-prelude
     , unison-sqlite
     , unison-util-base32hex
     , unison-util-cache
     , unison-util-file-embed
-    , unison-util-nametree
     , unison-util-serialization
     , unison-util-term
     , unliftio

diff --git a/contrib/cabal.project b/contrib/cabal.project
@@ -24,7 +24,6 @@ packages:
   lib/unison-util-relation
   lib/unison-util-rope
   lib/unison-util-file-embed
-  lib/unison-util-nametree
 
   parser-typechecker
   unison-core

diff --git a/lib/unison-util-nametree/package.yaml b/lib/unison-util-nametree/package.yaml
diff --git a/lib/unison-util-nametree/unison-util-nametree.cabal b/lib/unison-util-nametree/unison-util-nametree.cabal
diff --git a/parser-typechecker/package.yaml b/parser-typechecker/package.yaml
@@ -127,7 +127,6 @@ dependencies:
   - unison-util-base32hex
   - unison-util-bytes
   - unison-util-cache
-  - unison-util-nametree
   - unison-util-relation
   - unison-util-rope
   - unison-util-serialization

diff --git a/parser-typechecker/unison-parser-typechecker.cabal b/parser-typechecker/unison-parser-typechecker.cabal
@@ -1,6 +1,6 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.35.2.
+-- This file has been generated from package.yaml by hpack version 0.36.0.
 --
 -- see: https://github.com/sol/hpack
 
@@ -330,7 +330,6 @@ library
     , unison-util-base32hex
     , unison-util-bytes
     , unison-util-cache
-    , unison-util-nametree
     , unison-util-relation
     , unison-util-rope
     , unison-util-serialization
@@ -532,7 +531,6 @@ test-suite parser-typechecker-tests
     , unison-util-base32hex
     , unison-util-bytes
     , unison-util-cache
-    , unison-util-nametree
     , unison-util-relation
     , unison-util-rope
     , unison-util-serialization

diff --git a/stack.yaml b/stack.yaml
@@ -29,7 +29,6 @@ packages:
   - lib/unison-util-bytes
   - lib/unison-util-cache
   - lib/unison-util-file-embed
-  - lib/unison-util-nametree
   - lib/unison-util-relation
   - lib/unison-util-rope
   - parser-typechecker

diff --git a/unison-cli/package.yaml b/unison-cli/package.yaml
@@ -93,7 +93,6 @@ dependencies:
   - unison-sqlite
   - unison-syntax
   - unison-util-base32hex
-  - unison-util-nametree
   - unison-util-relation
   - unliftio
   - unordered-containers

diff --git a/unison-cli/unison-cli.cabal b/unison-cli/unison-cli.cabal
@@ -266,7 +266,6 @@ library
     , unison-sqlite
     , unison-syntax
     , unison-util-base32hex
-    , unison-util-nametree
     , unison-util-relation
     , unliftio
     , unordered-containers
@@ -410,7 +409,6 @@ executable transcripts
     , unison-sqlite
     , unison-syntax
     , unison-util-base32hex
-    , unison-util-nametree
     , unison-util-relation
     , unliftio
     , unordered-containers
@@ -558,7 +556,6 @@ test-suite cli-tests
     , unison-sqlite
     , unison-syntax
     , unison-util-base32hex
-    , unison-util-nametree
     , unison-util-relation
     , unliftio
     , unordered-containers

diff --git a/unison-core/package.yaml b/unison-core/package.yaml
@@ -24,6 +24,8 @@ library:
     - mtl
     - rfc5051
     - safe
+    - semialign
+    - semigroups
     - text
     - text-builder
     - these
@@ -54,25 +56,28 @@ tests:
     source-dirs: test
 
 default-extensions:
-  - ApplicativeDo
+  - BangPatterns
   - BlockArguments
   - DeriveAnyClass
   - DeriveFoldable
   - DeriveFunctor
   - DeriveGeneric
   - DeriveTraversable
   - DerivingStrategies
+  - DerivingVia
   - DoAndIfThenElse
   - FlexibleContexts
   - FlexibleInstances
   - GADTs
   - GeneralizedNewtypeDeriving
   - ImportQualifiedPost
+  - InstanceSigs
   - KindSignatures
   - LambdaCase
   - MultiParamTypeClasses
   - NamedFieldPuns
   - OverloadedStrings
+  - OverloadedRecordDot
   - PatternSynonyms
   - RankNTypes
   - ScopedTypeVariables

diff --git a/...on-util-nametree/src/Unison/Util/Defns.hs → unison-core/src/Unison/Util/Defns.hs b/...on-util-nametree/src/Unison/Util/Defns.hs → unison-core/src/Unison/Util/Defns.hs
diff --git a/...util-nametree/src/Unison/Util/Nametree.hs → unison-core/src/Unison/Util/Nametree.hs b/...util-nametree/src/Unison/Util/Nametree.hs → unison-core/src/Unison/Util/Nametree.hs
diff --git a/unison-core/unison-core1.cabal b/unison-core/unison-core1.cabal
@@ -55,30 +55,35 @@ library
       Unison.Type
       Unison.Type.Names
       Unison.Util.Components
+      Unison.Util.Defns
+      Unison.Util.Nametree
       Unison.Var
       Unison.WatchKind
   hs-source-dirs:
       src
   default-extensions:
-      ApplicativeDo
+      BangPatterns
       BlockArguments
       DeriveAnyClass
       DeriveFoldable
       DeriveFunctor
       DeriveGeneric
       DeriveTraversable
       DerivingStrategies
+      DerivingVia
       DoAndIfThenElse
       FlexibleContexts
       FlexibleInstances
       GADTs
       GeneralizedNewtypeDeriving
       ImportQualifiedPost
+      InstanceSigs
       KindSignatures
       LambdaCase
       MultiParamTypeClasses
       NamedFieldPuns
       OverloadedStrings
+      OverloadedRecordDot
       PatternSynonyms
       RankNTypes
       ScopedTypeVariables
@@ -102,6 +107,8 @@ library
     , nonempty-containers
     , rfc5051
     , safe
+    , semialign
+    , semigroups
     , text
     , text-builder
     , these
@@ -123,25 +130,28 @@ test-suite tests
   hs-source-dirs:
       test
   default-extensions:
-      ApplicativeDo
+      BangPatterns
       BlockArguments
       DeriveAnyClass
       DeriveFoldable
       DeriveFunctor
       DeriveGeneric
       DeriveTraversable
       DerivingStrategies
+      DerivingVia
       DoAndIfThenElse
       FlexibleContexts
       FlexibleInstances
       GADTs
       GeneralizedNewtypeDeriving
       ImportQualifiedPost
+      InstanceSigs
       KindSignatures
       LambdaCase
       MultiParamTypeClasses
       NamedFieldPuns
       OverloadedStrings
+      OverloadedRecordDot
       PatternSynonyms
       RankNTypes
       ScopedTypeVariables

diff --git a/unison-merge/package.yaml b/unison-merge/package.yaml
@@ -34,7 +34,6 @@ dependencies:
   - unison-sqlite
   - unison-syntax
   - unison-util-cache
-  - unison-util-nametree
   - unison-util-relation
   - vector
   - witherable

diff --git a/unison-merge/unison-merge.cabal b/unison-merge/unison-merge.cabal
@@ -103,7 +103,6 @@ library
     , unison-sqlite
     , unison-syntax
     , unison-util-cache
-    , unison-util-nametree
     , unison-util-relation
     , vector
     , witherable