merge unison-util-nametree into unison-core1

2024-10-03 21:28:01 +03:00 · 2024-07-02 12:23:34 -04:00 · 2024-07-02 12:23:34 -04:00 · eb1ee64cf2
commit eb1ee64cf2
parent 71eed210ce
16 changed files with 21 additions and 141 deletions
--- 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
--- a/codebase2/codebase-sqlite/unison-codebase-sqlite.cabal
+++ b/codebase2/codebase-sqlite/unison-codebase-sqlite.cabal
@ -126,6 +126,7 @@ library
    , unison-codebase-sync
    , unison-core
    , unison-core-orphans-sqlite
+    , unison-core1
    , unison-hash
    , unison-hash-orphans-sqlite
    , unison-prelude
@ -133,7 +134,6 @@ library
    , unison-util-base32hex
    , unison-util-cache
    , unison-util-file-embed
-    , unison-util-nametree
    , unison-util-serialization
    , unison-util-term
    , unliftio
--- 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
--- a/lib/unison-util-nametree/package.yaml
+++ b/lib/unison-util-nametree/package.yaml
@ -1,56 +0,0 @@
-name: unison-util-nametree
-github: unisonweb/unison
-copyright: Copyright (C) 2013-2018 Unison Computing, PBC and contributors
-
-ghc-options: -Wall
-
-dependencies:
-  - base
-  - containers
-  - lens
-  - semialign
-  - semigroups
-  - these
-  - unison-core
-  - unison-core1
-  - unison-prelude
-  - unison-util-relation
-
-library:
-  source-dirs: src
-  when:
-    - condition: false
-      other-modules: Paths_unison_util_nametree
-
-default-extensions:
-  - BangPatterns
-  - BlockArguments
-  - DeriveAnyClass
-  - DeriveFoldable
-  - DeriveFunctor
-  - DeriveGeneric
-  - DeriveTraversable
-  - DerivingStrategies
-  - DerivingVia
-  - DoAndIfThenElse
-  - DuplicateRecordFields
-  - FlexibleContexts
-  - FlexibleInstances
-  - GADTs
-  - GeneralizedNewtypeDeriving
-  - ImportQualifiedPost
-  - InstanceSigs
-  - LambdaCase
-  - MultiParamTypeClasses
-  - MultiWayIf
-  - NamedFieldPuns
-  - NumericUnderscores
-  - OverloadedLabels
-  - OverloadedRecordDot
-  - OverloadedStrings
-  - PatternSynonyms
-  - RankNTypes
-  - ScopedTypeVariables
-  - TupleSections
-  - TypeApplications
-  - ViewPatterns
--- a/lib/unison-util-nametree/unison-util-nametree.cabal
+++ b/lib/unison-util-nametree/unison-util-nametree.cabal
@ -1,68 +0,0 @@
-cabal-version: 1.12
-
-- This file has been generated from package.yaml by hpack version 0.36.0.
--
-- see: https://github.com/sol/hpack
-
-name:           unison-util-nametree
-version:        0.0.0
-homepage:       https://github.com/unisonweb/unison#readme
-bug-reports:    https://github.com/unisonweb/unison/issues
-copyright:      Copyright (C) 2013-2018 Unison Computing, PBC and contributors
-build-type:     Simple
-
-source-repository head
-  type: git
-  location: https://github.com/unisonweb/unison
-
-library
-  exposed-modules:
-      Unison.Util.Defns
-      Unison.Util.Nametree
-  hs-source-dirs:
-      src
-  default-extensions:
-      BangPatterns
-      BlockArguments
-      DeriveAnyClass
-      DeriveFoldable
-      DeriveFunctor
-      DeriveGeneric
-      DeriveTraversable
-      DerivingStrategies
-      DerivingVia
-      DoAndIfThenElse
-      DuplicateRecordFields
-      FlexibleContexts
-      FlexibleInstances
-      GADTs
-      GeneralizedNewtypeDeriving
-      ImportQualifiedPost
-      InstanceSigs
-      LambdaCase
-      MultiParamTypeClasses
-      MultiWayIf
-      NamedFieldPuns
-      NumericUnderscores
-      OverloadedLabels
-      OverloadedRecordDot
-      OverloadedStrings
-      PatternSynonyms
-      RankNTypes
-      ScopedTypeVariables
-      TupleSections
-      TypeApplications
-      ViewPatterns
-  ghc-options: -Wall
-  build-depends:
-      base
-    , containers
-    , lens
-    , semialign
-    , semigroups
-    , these
-    , unison-core
-    , unison-core1
-    , unison-prelude
-    , unison-util-relation
-  default-language: Haskell2010
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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,7 +56,7 @@ tests:
    source-dirs: test

 default-extensions:
-  - ApplicativeDo
+  - BangPatterns
  - BlockArguments
  - DeriveAnyClass
  - DeriveFoldable
@ -62,17 +64,20 @@ default-extensions:
  - DeriveGeneric
  - DeriveTraversable
  - DerivingStrategies
+  - DerivingVia
  - DoAndIfThenElse
  - FlexibleContexts
  - FlexibleInstances
  - GADTs
  - GeneralizedNewtypeDeriving
  - ImportQualifiedPost
+  - InstanceSigs
  - KindSignatures
  - LambdaCase
  - MultiParamTypeClasses
  - NamedFieldPuns
  - OverloadedStrings
+  - OverloadedRecordDot
  - PatternSynonyms
  - RankNTypes
  - ScopedTypeVariables
--- a/lib/unison-util-nametree/src/Unison/Util/Defns.hs
+++ b/lib/unison-util-nametree/src/Unison/Util/Defns.hs
--- a/lib/unison-util-nametree/src/Unison/Util/Nametree.hs
+++ b/lib/unison-util-nametree/src/Unison/Util/Nametree.hs
--- a/unison-core/unison-core1.cabal
+++ b/unison-core/unison-core1.cabal
@ -55,12 +55,14 @@ 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
@ -68,17 +70,20 @@ library
      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,7 +130,7 @@ test-suite tests
  hs-source-dirs:
      test
  default-extensions:
-      ApplicativeDo
+      BangPatterns
      BlockArguments
      DeriveAnyClass
      DeriveFoldable
@ -131,17 +138,20 @@ test-suite tests
      DeriveGeneric
      DeriveTraversable
      DerivingStrategies
+      DerivingVia
      DoAndIfThenElse
      FlexibleContexts
      FlexibleInstances
      GADTs
      GeneralizedNewtypeDeriving
      ImportQualifiedPost
+      InstanceSigs
      KindSignatures
      LambdaCase
      MultiParamTypeClasses
      NamedFieldPuns
      OverloadedStrings
+      OverloadedRecordDot
      PatternSynonyms
      RankNTypes
      ScopedTypeVariables
--- 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
--- 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