Merge remote-tracking branch 'upstream/trunk' into better-CLI-error-m…

…essages

.github/workflows/ci.md

@@ -9,7 +9,7 @@ At a high level, the CI process is:
 Some version numbers that are used during CI:
 - `ormolu_version: "0.5.0.1"`
 - `racket_version: "8.7"`
-- `jit_version: "@unison/internal/releases/0.0.17"`
+- `jit_version: "@unison/internal/releases/0.0.18"`
 
 Some cached directories:
   - `ucm_local_bin` a temp path for caching a built `ucm`

.github/workflows/ci.yaml

@@ -14,7 +14,7 @@ on:
 env:
   ormolu_version: 0.5.2.0
   ucm_local_bin: ucm-local-bin
-  jit_version: "@unison/internal/releases/0.0.17"
+  jit_version: "@unison/internal/releases/0.0.18"
   jit_src_scheme: unison-jit-src/scheme-libs/racket
   jit_dist: unison-jit-dist
   jit_generator_os: ubuntu-20.04

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

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

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

lib/unison-prelude/src/Unison/Debug.hs

@@ -13,13 +13,12 @@ module Unison.Debug
   )
 where
 
-import Control.Applicative (empty)
-import Control.Monad (when)
-import Data.Set (Set)
 import Data.Set qualified as Set
 import Data.Text qualified as Text
-import Debug.Pretty.Simple (pTrace, pTraceM, pTraceShowId, pTraceShowM)
+import Debug.Pretty.Simple (pTrace, pTraceM)
 import System.IO.Unsafe (unsafePerformIO)
+import Text.Pretty.Simple (pShow)
+import Unison.Prelude
 import UnliftIO.Environment (lookupEnv)
 
 data DebugFlag
@@ -148,7 +147,7 @@ debugPatternCoverageConstraintSolver = PatternCoverageConstraintSolver `Set.memb
 debug :: (Show a) => DebugFlag -> String -> a -> a
 debug flag msg a =
   if shouldDebug flag
-    then pTraceShowId (pTrace (msg <> ":\n") a)
+    then (pTrace (msg <> ":\n" <> into @String (pShow a)) a)
     else a
 
 -- | Use for selective debug logging in monadic contexts.
@@ -159,8 +158,7 @@ debug flag msg a =
 debugM :: (Show a, Monad m) => DebugFlag -> String -> a -> m ()
 debugM flag msg a =
   whenDebug flag do
-    pTraceM (msg <> ":\n")
-    pTraceShowM a
+    traceM (msg <> ":\n" <> into @String (pShow a))
 
 debugLog :: DebugFlag -> String -> a -> a
 debugLog flag msg =

lib/unison-pretty-printer/src/Unison/Util/Pretty.hs

@@ -78,7 +78,7 @@ module Unison.Util.Pretty
     lineSkip,
     nonEmpty,
     numbered,
-    numberedColumn2,
+    numberedColumn2ListFrom,
     numberedColumn2Header,
     numberedColumnNHeader,
     numberedList,
@@ -544,12 +544,12 @@ numberedHeader num ps = column2 (fmap num (Nothing : fmap Just [1 ..]) `zip` toL
 -- 1. one thing     : this is a thing
 -- 2. another thing : this is another thing
 -- 3. and another   : yet one more thing
-numberedColumn2 ::
-  (Foldable f, LL.ListLike s Char, IsString s) =>
-  (Int -> Pretty s) ->
-  f (Pretty s, Pretty s) ->
-  Pretty s
-numberedColumn2 num ps = numbered num (align $ toList ps)
+numberedColumn2ListFrom ::
+  (Foldable f) =>
+  Int ->
+  f (Pretty ColorText, Pretty ColorText) ->
+  Pretty ColorText
+numberedColumn2ListFrom num ps = numberedListFrom num (align $ toList ps)
 
 numberedColumn2Header ::
   (Foldable f, LL.ListLike s Char, IsString s) =>

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

parser-typechecker/src/Unison/Codebase/Path.hs

@@ -56,15 +56,13 @@ module Unison.Codebase.Path
     toList,
     toName,
     toName',
-    unsafeToName,
-    unsafeToName',
     toText,
     toText',
     unsplit,
     unsplit',
     unsplitAbsolute,
-    unsplitHQ,
-    unsplitHQ',
+    nameFromHQSplit,
+    nameFromHQSplit',
     nameFromSplit',
     splitFromName,
     splitFromName',
@@ -171,11 +169,11 @@ unsplitAbsolute :: (Absolute, NameSegment) -> Absolute
 unsplitAbsolute =
   coerce unsplit
 
-unsplitHQ :: HQSplit -> HQ'.HashQualified Path
-unsplitHQ (p, a) = fmap (snoc p) a
+nameFromHQSplit :: HQSplit -> HQ'.HashQualified Name
+nameFromHQSplit = nameFromHQSplit' . first (RelativePath' . Relative)
 
-unsplitHQ' :: HQSplit' -> HQ'.HashQualified Path'
-unsplitHQ' (p, a) = fmap (snoc' p) a
+nameFromHQSplit' :: HQSplit' -> HQ'.HashQualified Name
+nameFromHQSplit' (p, a) = fmap (nameFromSplit' . (p,)) a
 
 type Split = (Path, NameSegment)
 
@@ -316,9 +314,6 @@ cons = Lens.cons
 snoc :: Path -> NameSegment -> Path
 snoc = Lens.snoc
 
-snoc' :: Path' -> NameSegment -> Path'
-snoc' = Lens.snoc
-
 unsnoc :: Path -> Maybe (Path, NameSegment)
 unsnoc = Lens.unsnoc
 
@@ -344,15 +339,6 @@ fromName' n
   where
     path = fromName n
 
-unsafeToName :: Path -> Name
-unsafeToName =
-  fromMaybe (error "empty path") . toName
-
--- | Convert a Path' to a Name
-unsafeToName' :: Path' -> Name
-unsafeToName' =
-  fromMaybe (error "empty path") . toName'
-
 toName :: Path -> Maybe Name
 toName = \case
   Path Seq.Empty -> Nothing

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