From 022be2abb3a544e09233f226736379b4646e714e Mon Sep 17 00:00:00 2001 From: Arya Irani Date: Sat, 20 May 2023 22:41:54 -0400 Subject: [PATCH 01/11] update to resolver: nightly-2023-05-20 moved to ki 1.0.1.0 for greater build compatibility newly suppressed warnings in a few files - forall identifier - cases identifier (dunno how to suppress this which didn't show up as a warning) - type equality requires operators - deprecations --- codebase2/util-term/U/Util/Type.hs | 1 + .../src/Unison/Syntax/TermParser.hs | 2 +- .../src/Unison/Syntax/TypeParser.hs | 2 + stack.yaml | 11 +++-- stack.yaml.lock | 49 ++++++++++++------- unison-cli/src/Unison/LSP/Types.hs | 1 + unison-core/src/Unison/Type.hs | 1 + .../src/Unison/Hashing/V2/Type.hs | 2 + .../src/Unison/Share/API/Hash.hs | 1 + 9 files changed, 47 insertions(+), 23 deletions(-) diff --git a/codebase2/util-term/U/Util/Type.hs b/codebase2/util-term/U/Util/Type.hs index 7acf6a4c14..4877861346 100644 --- a/codebase2/util-term/U/Util/Type.hs +++ b/codebase2/util-term/U/Util/Type.hs @@ -1,6 +1,7 @@ {-# LANGUAGE PatternSynonyms #-} {-# LANGUAGE TupleSections #-} {-# LANGUAGE ViewPatterns #-} +{-# OPTIONS_GHC -Wno-forall-identifier #-} module U.Util.Type where diff --git a/parser-typechecker/src/Unison/Syntax/TermParser.hs b/parser-typechecker/src/Unison/Syntax/TermParser.hs index 4d624f7d9b..032fa9f11e 100644 --- a/parser-typechecker/src/Unison/Syntax/TermParser.hs +++ b/parser-typechecker/src/Unison/Syntax/TermParser.hs @@ -144,7 +144,7 @@ matchCases1 :: (Var v) => L.Token () -> P v (NonEmpty (Int, Term.MatchCase Ann ( matchCases1 start = do cases <- (sepBy semi matchCase) - <&> \cases -> [(n, c) | (n, cs) <- cases, c <- cs] + <&> \cases_ -> [(n, c) | (n, cs) <- cases_, c <- cs] case cases of [] -> P.customFailure (EmptyMatch start) (c : cs) -> pure (c NonEmpty.:| cs) diff --git a/parser-typechecker/src/Unison/Syntax/TypeParser.hs b/parser-typechecker/src/Unison/Syntax/TypeParser.hs index 8af9a2a3a0..b706db8058 100644 --- a/parser-typechecker/src/Unison/Syntax/TypeParser.hs +++ b/parser-typechecker/src/Unison/Syntax/TypeParser.hs @@ -1,3 +1,5 @@ +{-# OPTIONS_GHC -Wno-forall-identifier #-} + module Unison.Syntax.TypeParser where import Control.Monad.Reader (asks) diff --git a/stack.yaml b/stack.yaml index eadbec7cc8..c20ffe4809 100644 --- a/stack.yaml +++ b/stack.yaml @@ -39,15 +39,11 @@ packages: - unison-syntax - yaks/easytest -resolver: lts-20.21 +resolver: nightly-2023-05-20 extra-deps: - github: unisonweb/configurator commit: e47e9e9fe1f576f8c835183b9def52d73c01327a -- github: awkward-squad/ki - commit: 563e96238dfe392dccf68d93953c8f30fd53bec8 - subdirs: - - ki # This custom Haskeline alters ANSI rendering on Windows. # If changing the haskeline dependency, please ensure color renders properly in a # Windows terminal. @@ -56,11 +52,16 @@ extra-deps: commit: 9275eea7982dabbf47be2ba078ced669ae7ef3d5 # not in lts-20.21 +- fsnotify-0.3.0.1 - fuzzyfind-3.0.1 - guid-0.1.0@sha256:a7c975be473f6f142d5cc1b39bc807a99043d20b1bb0873fdfe7a3ce84d2faf1,1078 - lock-file-0.7.0.0@sha256:3ad84b5e454145e1d928063b56abb96db24a99a21b493989520e58fa0ab37b00,4484 - monad-validate-1.2.0.0@sha256:9850f408431098b28806dd464b6825a88a0b56c84f380d7fe0454c1df9d6f881,3505 - recover-rtti-0.4.2@sha256:c179a303921126d8d782264e14f386c96e54a270df74be002e4c4ec3c8c7aebd,4529 +# not in nightly-2023-05-20 +- shellmet-0.0.4.1 +- NanoID-3.3.0 +- base32-0.2.2.0 ghc-options: # All packages diff --git a/stack.yaml.lock b/stack.yaml.lock index 9475fba1e2..8084169a5a 100644 --- a/stack.yaml.lock +++ b/stack.yaml.lock @@ -15,19 +15,6 @@ packages: version: 0.3.0.0 original: url: https://github.com/unisonweb/configurator/archive/e47e9e9fe1f576f8c835183b9def52d73c01327a.tar.gz -- completed: - name: ki - pantry-tree: - sha256: c63220c438c076818e09061b117c56055e154f6abb66ea9bc44a3900fcabd654 - size: 704 - sha256: a45eb3dbe7333c108aef4afce7f763c7661919b09641ef9d241c7ca4a78bf735 - size: 15840 - subdir: ki - url: https://github.com/awkward-squad/ki/archive/563e96238dfe392dccf68d93953c8f30fd53bec8.tar.gz - version: 1.0.0 - original: - subdir: ki - url: https://github.com/awkward-squad/ki/archive/563e96238dfe392dccf68d93953c8f30fd53bec8.tar.gz - completed: name: haskeline pantry-tree: @@ -39,6 +26,13 @@ packages: version: 0.8.0.0 original: url: https://github.com/unisonweb/haskeline/archive/9275eea7982dabbf47be2ba078ced669ae7ef3d5.tar.gz +- completed: + hackage: fsnotify-0.3.0.1@sha256:fbec8cddd3f991d5b905df16895c67717b0f580e1ef33de34d93de814af1a08a,2988 + pantry-tree: + sha256: 37a2111006e61b752f3d4690dc81d76a4cedf3415dc486779addb2a033f5de58 + size: 1130 + original: + hackage: fsnotify-0.3.0.1 - completed: hackage: fuzzyfind-3.0.1@sha256:78f89c1d79adf0a15fa2e57c693d42b4765ccfbbe380d0c9d7da6bff9f124f85,1823 pantry-tree: @@ -74,9 +68,30 @@ packages: size: 2488 original: hackage: recover-rtti-0.4.2@sha256:c179a303921126d8d782264e14f386c96e54a270df74be002e4c4ec3c8c7aebd,4529 +- completed: + hackage: shellmet-0.0.4.1@sha256:6d1dd3ce296b00a589e439d20a4466515cdf3e6156a0a147156804ee544ee9d1,3239 + pantry-tree: + sha256: 5f5b89ad4dd21b03ee7518f745d50d881e0ae99ad6d8d5b9006ce798dd5d968f + size: 371 + original: + hackage: shellmet-0.0.4.1 +- completed: + hackage: NanoID-3.3.0@sha256:027d369d5ec841e982c68cbc78ea87c4e91b9ffe66908ab7f0be62eb465f6ae2,1648 + pantry-tree: + sha256: 80ff9b1b12cb0ad102c7e5b935d6f3781f37f9375756c6df5b900f776e608724 + size: 364 + original: + hackage: NanoID-3.3.0 +- completed: + hackage: base32-0.2.2.0@sha256:61a5c1f457b619700ce600a43ce5e695cddd31f09aac540df23258bf9027ee9d,2563 + pantry-tree: + sha256: 7f684f2fa28ad83e70c1c5d22c4f7487e5b7dcc340aac1aad833fa5b32d17640 + size: 1936 + original: + hackage: base32-0.2.2.0 snapshots: - completed: - sha256: 401a0e813162ba62f04517f60c7d25e93a0f867f94a902421ebf07d1fb5a8c46 - size: 650044 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/20/21.yaml - original: lts-20.21 + sha256: 359dfcca6f69bb32f4f41eb951df23e1087fda7147c91cf8320813cdcc14e4dc + size: 632121 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2023/5/20.yaml + original: nightly-2023-05-20 diff --git a/unison-cli/src/Unison/LSP/Types.hs b/unison-cli/src/Unison/LSP/Types.hs index 0ef462eeb2..d28f42b8c0 100644 --- a/unison-cli/src/Unison/LSP/Types.hs +++ b/unison-cli/src/Unison/LSP/Types.hs @@ -3,6 +3,7 @@ {-# LANGUAGE PolyKinds #-} {-# LANGUAGE RecordWildCards #-} {-# LANGUAGE UndecidableInstances #-} +{-# OPTIONS_GHC -Wno-type-equality-requires-operators #-} module Unison.LSP.Types where diff --git a/unison-core/src/Unison/Type.hs b/unison-core/src/Unison/Type.hs index 3fe3d803b1..479ef0390e 100644 --- a/unison-core/src/Unison/Type.hs +++ b/unison-core/src/Unison/Type.hs @@ -1,4 +1,5 @@ {-# LANGUAGE DataKinds #-} +{-# OPTIONS_GHC -Wno-forall-identifier #-} module Unison.Type where diff --git a/unison-hashing-v2/src/Unison/Hashing/V2/Type.hs b/unison-hashing-v2/src/Unison/Hashing/V2/Type.hs index ee5ea8757b..3706cc07e8 100644 --- a/unison-hashing-v2/src/Unison/Hashing/V2/Type.hs +++ b/unison-hashing-v2/src/Unison/Hashing/V2/Type.hs @@ -1,3 +1,5 @@ +{-# OPTIONS_GHC -Wno-forall-identifier #-} + module Unison.Hashing.V2.Type ( Type, TypeF (..), diff --git a/unison-share-projects-api/src/Unison/Share/API/Hash.hs b/unison-share-projects-api/src/Unison/Share/API/Hash.hs index 5366b5eb5d..ff5e44781a 100644 --- a/unison-share-projects-api/src/Unison/Share/API/Hash.hs +++ b/unison-share-projects-api/src/Unison/Share/API/Hash.hs @@ -1,4 +1,5 @@ {-# LANGUAGE RecordWildCards #-} +{-# OPTIONS_GHC -Wno-deprecations #-} -- | Hash-related types in the Share API. module Unison.Share.API.Hash From 178a7529265a31c7dfc0322bd76e79941c7a5a45 Mon Sep 17 00:00:00 2001 From: Arya Irani Date: Sat, 20 May 2023 22:55:48 -0400 Subject: [PATCH 02/11] apparently we still need allow-newer: true --- stack.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/stack.yaml b/stack.yaml index c20ffe4809..68e19854a4 100644 --- a/stack.yaml +++ b/stack.yaml @@ -40,6 +40,7 @@ packages: - yaks/easytest resolver: nightly-2023-05-20 +allow-newer: true extra-deps: - github: unisonweb/configurator From 017689f6936dcf2e1af2e1f50ffa08a35769cc17 Mon Sep 17 00:00:00 2001 From: Arya Irani Date: Sun, 21 May 2023 18:38:43 -0400 Subject: [PATCH 03/11] temporarily suppress `forall-identifier` warnings in tests too --- parser-typechecker/tests/Unison/Test/DataDeclaration.hs | 1 + parser-typechecker/tests/Unison/Test/Typechecker.hs | 1 + unison-core/src/Unison/DataDeclaration.hs | 1 + 3 files changed, 3 insertions(+) diff --git a/parser-typechecker/tests/Unison/Test/DataDeclaration.hs b/parser-typechecker/tests/Unison/Test/DataDeclaration.hs index e7fcea7518..0873822ef2 100644 --- a/parser-typechecker/tests/Unison/Test/DataDeclaration.hs +++ b/parser-typechecker/tests/Unison/Test/DataDeclaration.hs @@ -1,5 +1,6 @@ {-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE QuasiQuotes #-} +{-# OPTIONS_GHC -Wno-forall-identifier #-} module Unison.Test.DataDeclaration where diff --git a/parser-typechecker/tests/Unison/Test/Typechecker.hs b/parser-typechecker/tests/Unison/Test/Typechecker.hs index 3afbeffd5a..3cc62000a2 100644 --- a/parser-typechecker/tests/Unison/Test/Typechecker.hs +++ b/parser-typechecker/tests/Unison/Test/Typechecker.hs @@ -1,4 +1,5 @@ {-# LANGUAGE OverloadedStrings #-} +{-# OPTIONS_GHC -Wno-forall-identifier #-} module Unison.Test.Typechecker where diff --git a/unison-core/src/Unison/DataDeclaration.hs b/unison-core/src/Unison/DataDeclaration.hs index 849dc42858..2177a34d92 100644 --- a/unison-core/src/Unison/DataDeclaration.hs +++ b/unison-core/src/Unison/DataDeclaration.hs @@ -1,4 +1,5 @@ {-# LANGUAGE RecordWildCards #-} +{-# OPTIONS_GHC -Wno-forall-identifier #-} module Unison.DataDeclaration ( DataDeclaration (..), From 76ca4071bffee75ee4779966e42caeaf4ea8df6e Mon Sep 17 00:00:00 2001 From: Arya Irani Date: Sun, 21 May 2023 18:39:21 -0400 Subject: [PATCH 04/11] update Data.Text.Encoding error message in some transcript outputs. --- unison-src/transcripts-using-base/failure-tests.output.md | 2 +- unison-src/transcripts-using-base/utf8.output.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/unison-src/transcripts-using-base/failure-tests.output.md b/unison-src/transcripts-using-base/failure-tests.output.md index 7e5f29a49c..118f1037b9 100644 --- a/unison-src/transcripts-using-base/failure-tests.output.md +++ b/unison-src/transcripts-using-base/failure-tests.output.md @@ -48,7 +48,7 @@ test2 = do Failure (typeLink IOFailure) - "Cannot decode byte '\\xee': Data.Text.Internal.Encoding.decodeUtf8: Invalid UTF-8 stream" + "Cannot decode byte '\\xee': Data.Text.Encoding: Invalid UTF-8 stream" (Any ()) diff --git a/unison-src/transcripts-using-base/utf8.output.md b/unison-src/transcripts-using-base/utf8.output.md index ab99fd866d..8d8b464a82 100644 --- a/unison-src/transcripts-using-base/utf8.output.md +++ b/unison-src/transcripts-using-base/utf8.output.md @@ -130,6 +130,6 @@ greek_bytes = Bytes.fromList [206, 145, 206, 146, 206, 147, 206, 148, 206] 5 | > match fromUtf8.impl (drop 1 greek_bytes) with ⧩ - "Cannot decode byte '\\x91': Data.Text.Internal.Encoding.decodeUtf8: Invalid UTF-8 stream" + "Cannot decode byte '\\x91': Data.Text.Encoding: Invalid UTF-8 stream" ``` From d61194d22138b910af745cea8234f983cd3b7969 Mon Sep 17 00:00:00 2001 From: Arya Irani Date: Tue, 23 May 2023 08:48:30 -0400 Subject: [PATCH 05/11] clean up stack.yaml, remove allow-newer: true again --- stack.yaml | 18 +++++++++++------- stack.yaml.lock | 42 +++++++++++++++++++++--------------------- 2 files changed, 32 insertions(+), 28 deletions(-) diff --git a/stack.yaml b/stack.yaml index 68e19854a4..54934ab22d 100644 --- a/stack.yaml +++ b/stack.yaml @@ -40,11 +40,12 @@ packages: - yaks/easytest resolver: nightly-2023-05-20 -allow-newer: true extra-deps: +# This custom build supports defining blocks for deeper keys without explicitly nesting blocks - github: unisonweb/configurator commit: e47e9e9fe1f576f8c835183b9def52d73c01327a + # This custom Haskeline alters ANSI rendering on Windows. # If changing the haskeline dependency, please ensure color renders properly in a # Windows terminal. @@ -52,17 +53,20 @@ extra-deps: - github: unisonweb/haskeline commit: 9275eea7982dabbf47be2ba078ced669ae7ef3d5 -# not in lts-20.21 -- fsnotify-0.3.0.1 +# snapshot version is too new +- fsnotify-0.3.0.1 # vs 0.4.1.0 + +# in lts-20 but not in snapshot +- NanoID-3.3.0 +- shellmet-0.0.4.1 +- base32-0.2.2.0 + +# not in stackage - fuzzyfind-3.0.1 - guid-0.1.0@sha256:a7c975be473f6f142d5cc1b39bc807a99043d20b1bb0873fdfe7a3ce84d2faf1,1078 - lock-file-0.7.0.0@sha256:3ad84b5e454145e1d928063b56abb96db24a99a21b493989520e58fa0ab37b00,4484 - monad-validate-1.2.0.0@sha256:9850f408431098b28806dd464b6825a88a0b56c84f380d7fe0454c1df9d6f881,3505 - recover-rtti-0.4.2@sha256:c179a303921126d8d782264e14f386c96e54a270df74be002e4c4ec3c8c7aebd,4529 -# not in nightly-2023-05-20 -- shellmet-0.0.4.1 -- NanoID-3.3.0 -- base32-0.2.2.0 ghc-options: # All packages diff --git a/stack.yaml.lock b/stack.yaml.lock index 8084169a5a..fab9bd9422 100644 --- a/stack.yaml.lock +++ b/stack.yaml.lock @@ -33,6 +33,27 @@ packages: size: 1130 original: hackage: fsnotify-0.3.0.1 +- completed: + hackage: NanoID-3.3.0@sha256:027d369d5ec841e982c68cbc78ea87c4e91b9ffe66908ab7f0be62eb465f6ae2,1648 + pantry-tree: + sha256: 80ff9b1b12cb0ad102c7e5b935d6f3781f37f9375756c6df5b900f776e608724 + size: 364 + original: + hackage: NanoID-3.3.0 +- completed: + hackage: shellmet-0.0.4.1@sha256:6d1dd3ce296b00a589e439d20a4466515cdf3e6156a0a147156804ee544ee9d1,3239 + pantry-tree: + sha256: 5f5b89ad4dd21b03ee7518f745d50d881e0ae99ad6d8d5b9006ce798dd5d968f + size: 371 + original: + hackage: shellmet-0.0.4.1 +- completed: + hackage: base32-0.2.2.0@sha256:61a5c1f457b619700ce600a43ce5e695cddd31f09aac540df23258bf9027ee9d,2563 + pantry-tree: + sha256: 7f684f2fa28ad83e70c1c5d22c4f7487e5b7dcc340aac1aad833fa5b32d17640 + size: 1936 + original: + hackage: base32-0.2.2.0 - completed: hackage: fuzzyfind-3.0.1@sha256:78f89c1d79adf0a15fa2e57c693d42b4765ccfbbe380d0c9d7da6bff9f124f85,1823 pantry-tree: @@ -68,27 +89,6 @@ packages: size: 2488 original: hackage: recover-rtti-0.4.2@sha256:c179a303921126d8d782264e14f386c96e54a270df74be002e4c4ec3c8c7aebd,4529 -- completed: - hackage: shellmet-0.0.4.1@sha256:6d1dd3ce296b00a589e439d20a4466515cdf3e6156a0a147156804ee544ee9d1,3239 - pantry-tree: - sha256: 5f5b89ad4dd21b03ee7518f745d50d881e0ae99ad6d8d5b9006ce798dd5d968f - size: 371 - original: - hackage: shellmet-0.0.4.1 -- completed: - hackage: NanoID-3.3.0@sha256:027d369d5ec841e982c68cbc78ea87c4e91b9ffe66908ab7f0be62eb465f6ae2,1648 - pantry-tree: - sha256: 80ff9b1b12cb0ad102c7e5b935d6f3781f37f9375756c6df5b900f776e608724 - size: 364 - original: - hackage: NanoID-3.3.0 -- completed: - hackage: base32-0.2.2.0@sha256:61a5c1f457b619700ce600a43ce5e695cddd31f09aac540df23258bf9027ee9d,2563 - pantry-tree: - sha256: 7f684f2fa28ad83e70c1c5d22c4f7487e5b7dcc340aac1aad833fa5b32d17640 - size: 1936 - original: - hackage: base32-0.2.2.0 snapshots: - completed: sha256: 359dfcca6f69bb32f4f41eb951df23e1087fda7147c91cf8320813cdcc14e4dc From 48e48bd6692fc76514db7f12f2f1b16e31906896 Mon Sep 17 00:00:00 2001 From: Arya Irani Date: Tue, 23 May 2023 09:49:26 -0400 Subject: [PATCH 06/11] re-add allow-newer: true + explanation --- stack.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/stack.yaml b/stack.yaml index 54934ab22d..a18446a775 100644 --- a/stack.yaml +++ b/stack.yaml @@ -40,6 +40,12 @@ packages: - yaks/easytest resolver: nightly-2023-05-20 +allow-newer: true +# NanoID-3.3.0 disallows base 4.17 from ghc 9.4 +# base32-0.2.2.0 disallows base 4.17, text 2.x +# fuzzyfind-3.0.1 disallows criterion 1.6, text 2.x +# recover-rtti-0.4.2 disallows aeson 2.1.x, base 4.17, ghc-heap 9.4, primitive 0.8, vector 0.13 +# shellmet-0.0.4.1 disallows base 4.17 extra-deps: # This custom build supports defining blocks for deeper keys without explicitly nesting blocks From 3c6d061e47054c12bd02eaf8386bf759b54d3009 Mon Sep 17 00:00:00 2001 From: Arya Irani Date: Tue, 23 May 2023 14:38:32 -0400 Subject: [PATCH 07/11] pin network-3.1.2.7 which builds on windows --- stack.yaml | 1 + stack.yaml.lock | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/stack.yaml b/stack.yaml index a18446a775..5d4d9c9e7b 100644 --- a/stack.yaml +++ b/stack.yaml @@ -61,6 +61,7 @@ extra-deps: # snapshot version is too new - fsnotify-0.3.0.1 # vs 0.4.1.0 +- network-3.1.2.7 # 3.1.3.0 doesn't seem to build in GH actions windows-2019 # in lts-20 but not in snapshot - NanoID-3.3.0 diff --git a/stack.yaml.lock b/stack.yaml.lock index fab9bd9422..5e972665ca 100644 --- a/stack.yaml.lock +++ b/stack.yaml.lock @@ -33,6 +33,13 @@ packages: size: 1130 original: hackage: fsnotify-0.3.0.1 +- completed: + hackage: network-3.1.2.7@sha256:9752628bc626e0cad8c53039bea0dc0417f39ca6663232e4d9ac4e35a8925f7d,4911 + pantry-tree: + sha256: aa95093a413ed8306699098159047580e0dc0bda4a862a0264a370b993319b24 + size: 3971 + original: + hackage: network-3.1.2.7 - completed: hackage: NanoID-3.3.0@sha256:027d369d5ec841e982c68cbc78ea87c4e91b9ffe66908ab7f0be62eb465f6ae2,1648 pantry-tree: From 586fc81b4e538ac8a749588192d06851cb71fbd3 Mon Sep 17 00:00:00 2001 From: Arya Irani Date: Tue, 23 May 2023 16:09:44 -0400 Subject: [PATCH 08/11] rename the files --- unison-core/src/Unison/{Referent'.hs => GReferent.hs} | 4 ++-- .../src/Unison/{HashQualified'.hs => HashQualified2.hs} | 4 ++-- .../src/Unison/Server/{SearchResult'.hs => SearchResult2.hs} | 4 ++-- .../Unison/Syntax/{HashQualified'.hs => HashQualified2.hs} | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) rename unison-core/src/Unison/{Referent'.hs => GReferent.hs} (97%) rename unison-core/src/Unison/{HashQualified'.hs => HashQualified2.hs} (97%) rename unison-share-api/src/Unison/Server/{SearchResult'.hs => SearchResult2.hs} (96%) rename unison-syntax/src/Unison/Syntax/{HashQualified'.hs => HashQualified2.hs} (94%) diff --git a/unison-core/src/Unison/Referent'.hs b/unison-core/src/Unison/GReferent.hs similarity index 97% rename from unison-core/src/Unison/Referent'.hs rename to unison-core/src/Unison/GReferent.hs index b65b75e09d..9123532a0a 100644 --- a/unison-core/src/Unison/Referent'.hs +++ b/unison-core/src/Unison/GReferent.hs @@ -1,12 +1,12 @@ {-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE PatternSynonyms #-} -module Unison.Referent' +module Unison.GReferent ( Referent' (..), -- * Basic queries isConstructor, - Unison.Referent'.fold, + Unison.GReferent.fold, -- * Lenses reference_, diff --git a/unison-core/src/Unison/HashQualified'.hs b/unison-core/src/Unison/HashQualified2.hs similarity index 97% rename from unison-core/src/Unison/HashQualified'.hs rename to unison-core/src/Unison/HashQualified2.hs index 48b4ded570..132fdeaebe 100644 --- a/unison-core/src/Unison/HashQualified'.hs +++ b/unison-core/src/Unison/HashQualified2.hs @@ -1,4 +1,4 @@ -module Unison.HashQualified' where +module Unison.HashQualified2 where import qualified Data.Text as Text import qualified Unison.HashQualified as HQ @@ -14,7 +14,7 @@ import Unison.ShortHash (ShortHash) import qualified Unison.ShortHash as SH import Prelude hiding (take) --- | Like Unison.HashQualified, but doesn't support a HashOnly variant +-- | Like Unison.HashQualified2, but doesn't support a HashOnly variant data HashQualified n = NameOnly n | HashQualified n ShortHash deriving stock (Eq, Functor, Generic, Foldable, Ord, Show, Traversable) diff --git a/unison-share-api/src/Unison/Server/SearchResult'.hs b/unison-share-api/src/Unison/Server/SearchResult2.hs similarity index 96% rename from unison-share-api/src/Unison/Server/SearchResult'.hs rename to unison-share-api/src/Unison/Server/SearchResult2.hs index 886435be45..98f481b391 100644 --- a/unison-share-api/src/Unison/Server/SearchResult'.hs +++ b/unison-share-api/src/Unison/Server/SearchResult2.hs @@ -1,6 +1,6 @@ {-# LANGUAGE PatternSynonyms #-} -module Unison.Server.SearchResult' where +module Unison.Server.SearchResult2 where import qualified Data.Set as Set import Unison.Codebase.Editor.DisplayObject (DisplayObject) @@ -8,7 +8,7 @@ import qualified Unison.Codebase.Editor.DisplayObject as DT import Unison.DataDeclaration (Decl) import qualified Unison.DataDeclaration as DD import qualified Unison.HashQualified as HQ -import qualified Unison.HashQualified' as HQ' +import qualified Unison.HashQualified2 as HQ' import Unison.LabeledDependency (LabeledDependency) import qualified Unison.LabeledDependency as LD import Unison.Name (Name) diff --git a/unison-syntax/src/Unison/Syntax/HashQualified'.hs b/unison-syntax/src/Unison/Syntax/HashQualified2.hs similarity index 94% rename from unison-syntax/src/Unison/Syntax/HashQualified'.hs rename to unison-syntax/src/Unison/Syntax/HashQualified2.hs index 20b6cd996f..a17155a85e 100644 --- a/unison-syntax/src/Unison/Syntax/HashQualified'.hs +++ b/unison-syntax/src/Unison/Syntax/HashQualified2.hs @@ -1,7 +1,7 @@ {-# OPTIONS_GHC -fno-warn-orphans #-} -- | Syntax-related combinators for HashQualified' (to/from string types). -module Unison.Syntax.HashQualified' +module Unison.Syntax.HashQualified2 ( fromString, fromText, unsafeFromText, @@ -11,7 +11,7 @@ module Unison.Syntax.HashQualified' where import qualified Data.Text as Text -import qualified Unison.HashQualified' as HQ' +import qualified Unison.HashQualified2' as HQ' import Unison.Name (Name, Parse) import qualified Unison.Name as Name import Unison.Prelude hiding (fromString) From 27b9fcca40cb451aa974dd83e025e2004a41ce45 Mon Sep 17 00:00:00 2001 From: Arya Irani Date: Tue, 23 May 2023 16:09:53 -0400 Subject: [PATCH 09/11] update the references --- lib/unison-pretty-printer/src/Unison/Util/SyntaxText.hs | 2 +- parser-typechecker/src/Unison/Codebase/BranchUtil.hs | 4 ++-- parser-typechecker/src/Unison/Codebase/Path.hs | 2 +- parser-typechecker/src/Unison/Codebase/Path/Parse.hs | 2 +- .../Codebase/SqliteCodebase/Migrations/MigrateSchema1To2.hs | 2 +- parser-typechecker/src/Unison/PrettyPrintEnv.hs | 2 +- parser-typechecker/src/Unison/PrettyPrintEnv/Names.hs | 2 +- parser-typechecker/src/Unison/Syntax/NamePrinter.hs | 2 +- parser-typechecker/tests/Unison/Test/Codebase/Path.hs | 2 +- unison-cli/src/Unison/Cli/MonadUtils.hs | 2 +- unison-cli/src/Unison/Codebase/Editor/HandleInput.hs | 6 +++--- unison-cli/src/Unison/Codebase/Editor/Output.hs | 4 ++-- unison-cli/src/Unison/Codebase/Editor/Output/BranchDiff.hs | 2 +- unison-cli/src/Unison/Codebase/Editor/Slurp.hs | 2 +- unison-cli/src/Unison/CommandLine/Completion.hs | 2 +- unison-cli/src/Unison/CommandLine/OutputMessages.hs | 6 +++--- unison-cli/src/Unison/LSP/Completion.hs | 4 ++-- unison-cli/src/Unison/LSP/FileAnalysis.hs | 2 +- unison-core/src/Unison/DataDeclaration.hs | 2 +- unison-core/src/Unison/Names.hs | 2 +- unison-core/src/Unison/NamesWithHistory.hs | 2 +- unison-core/src/Unison/Referent.hs | 2 +- unison-core/unison-core1.cabal | 6 +++--- unison-share-api/src/Unison/Server/Backend.hs | 6 +++--- unison-share-api/src/Unison/Server/NameSearch.hs | 2 +- unison-share-api/src/Unison/Server/NameSearch/FromNames.hs | 2 +- unison-share-api/src/Unison/Server/NameSearch/Sqlite.hs | 2 +- unison-share-api/src/Unison/Server/Orphans.hs | 4 ++-- unison-share-api/src/Unison/Server/SearchResult.hs | 2 +- unison-share-api/src/Unison/Server/Types.hs | 2 +- unison-share-api/src/Unison/Util/Find.hs | 2 +- unison-share-api/unison-share-api.cabal | 2 +- unison-syntax/src/Unison/Syntax/HashQualified2.hs | 2 +- unison-syntax/unison-syntax.cabal | 2 +- 34 files changed, 46 insertions(+), 46 deletions(-) diff --git a/lib/unison-pretty-printer/src/Unison/Util/SyntaxText.hs b/lib/unison-pretty-printer/src/Unison/Util/SyntaxText.hs index 294a27b5bb..bb82c32ebc 100644 --- a/lib/unison-pretty-printer/src/Unison/Util/SyntaxText.hs +++ b/lib/unison-pretty-printer/src/Unison/Util/SyntaxText.hs @@ -4,7 +4,7 @@ import Unison.HashQualified (HashQualified) import Unison.Name (Name) import Unison.Pattern (SeqOp) import Unison.Prelude -import Unison.Referent' (Referent') +import Unison.GReferent (Referent') import Unison.Util.AnnotatedText (AnnotatedText (..), annotate, segment) type SyntaxText' r = AnnotatedText (Element r) diff --git a/parser-typechecker/src/Unison/Codebase/BranchUtil.hs b/parser-typechecker/src/Unison/Codebase/BranchUtil.hs index ded59dc2aa..bf2844c0ef 100644 --- a/parser-typechecker/src/Unison/Codebase/BranchUtil.hs +++ b/parser-typechecker/src/Unison/Codebase/BranchUtil.hs @@ -31,8 +31,8 @@ import qualified Unison.Codebase.Metadata as Metadata import Unison.Codebase.Patch (Patch) import Unison.Codebase.Path (Path) import qualified Unison.Codebase.Path as Path -import Unison.HashQualified' (HashQualified (HashQualified, NameOnly)) -import qualified Unison.HashQualified' as HQ' +import Unison.HashQualified2 (HashQualified (HashQualified, NameOnly)) +import qualified Unison.HashQualified2 as HQ' import Unison.NameSegment (NameSegment) import Unison.Names (Names) import qualified Unison.Names as Names diff --git a/parser-typechecker/src/Unison/Codebase/Path.hs b/parser-typechecker/src/Unison/Codebase/Path.hs index 360fc20b47..a4e4207867 100644 --- a/parser-typechecker/src/Unison/Codebase/Path.hs +++ b/parser-typechecker/src/Unison/Codebase/Path.hs @@ -88,7 +88,7 @@ import Data.Sequence (Seq ((:<|), (:|>))) import qualified Data.Sequence as Seq import qualified Data.Text as Text import qualified GHC.Exts as GHC -import qualified Unison.HashQualified' as HQ' +import qualified Unison.HashQualified2 as HQ' import Unison.Name (Convert (..), Name, Parse) import qualified Unison.Name as Name import Unison.NameSegment (NameSegment (NameSegment)) diff --git a/parser-typechecker/src/Unison/Codebase/Path/Parse.hs b/parser-typechecker/src/Unison/Codebase/Path/Parse.hs index 74fca980ea..4554f8915c 100644 --- a/parser-typechecker/src/Unison/Codebase/Path/Parse.hs +++ b/parser-typechecker/src/Unison/Codebase/Path/Parse.hs @@ -22,7 +22,7 @@ import Data.Bifunctor (first) import Data.List.Extra (stripPrefix) import qualified Data.Text as Text import Unison.Codebase.Path -import qualified Unison.HashQualified' as HQ' +import qualified Unison.HashQualified2 as HQ' import Unison.NameSegment (NameSegment (NameSegment)) import qualified Unison.NameSegment as NameSegment import Unison.Prelude hiding (empty, toList) diff --git a/parser-typechecker/src/Unison/Codebase/SqliteCodebase/Migrations/MigrateSchema1To2.hs b/parser-typechecker/src/Unison/Codebase/SqliteCodebase/Migrations/MigrateSchema1To2.hs index 46ac7444c5..9c10e0b136 100644 --- a/parser-typechecker/src/Unison/Codebase/SqliteCodebase/Migrations/MigrateSchema1To2.hs +++ b/parser-typechecker/src/Unison/Codebase/SqliteCodebase/Migrations/MigrateSchema1To2.hs @@ -72,7 +72,7 @@ import qualified Unison.Pattern as Pattern import Unison.Prelude import qualified Unison.Reference as Reference import qualified Unison.Referent as Referent -import qualified Unison.Referent' as Referent' +import qualified Unison.GReferent as Referent' import qualified Unison.Sqlite as Sqlite import Unison.Symbol (Symbol) import qualified Unison.Term as Term diff --git a/parser-typechecker/src/Unison/PrettyPrintEnv.hs b/parser-typechecker/src/Unison/PrettyPrintEnv.hs index d395d4398c..4d130d92ac 100644 --- a/parser-typechecker/src/Unison/PrettyPrintEnv.hs +++ b/parser-typechecker/src/Unison/PrettyPrintEnv.hs @@ -28,7 +28,7 @@ import Unison.ConstructorReference (ConstructorReference) import qualified Unison.ConstructorType as CT import Unison.HashQualified (HashQualified) import qualified Unison.HashQualified as HQ -import qualified Unison.HashQualified' as HQ' +import qualified Unison.HashQualified2 as HQ' import Unison.LabeledDependency (LabeledDependency) import qualified Unison.LabeledDependency as LD import Unison.Name (Name) diff --git a/parser-typechecker/src/Unison/PrettyPrintEnv/Names.hs b/parser-typechecker/src/Unison/PrettyPrintEnv/Names.hs index 732cbbb138..cc42603b18 100644 --- a/parser-typechecker/src/Unison/PrettyPrintEnv/Names.hs +++ b/parser-typechecker/src/Unison/PrettyPrintEnv/Names.hs @@ -4,7 +4,7 @@ module Unison.PrettyPrintEnv.Names (fromNames, fromSuffixNames) where import Data.Bifunctor (second) import qualified Data.Set as Set -import qualified Unison.HashQualified' as HQ' +import qualified Unison.HashQualified2 as HQ' import Unison.Name (Name) import qualified Unison.Name as Name import qualified Unison.Names as Names diff --git a/parser-typechecker/src/Unison/Syntax/NamePrinter.hs b/parser-typechecker/src/Unison/Syntax/NamePrinter.hs index 49a79ab836..b57ddf581e 100644 --- a/parser-typechecker/src/Unison/Syntax/NamePrinter.hs +++ b/parser-typechecker/src/Unison/Syntax/NamePrinter.hs @@ -1,7 +1,7 @@ module Unison.Syntax.NamePrinter where import qualified Unison.HashQualified as HQ -import qualified Unison.HashQualified' as HQ' +import qualified Unison.HashQualified2 as HQ' import Unison.LabeledDependency (LabeledDependency) import qualified Unison.LabeledDependency as LD import Unison.Name (Name) diff --git a/parser-typechecker/tests/Unison/Test/Codebase/Path.hs b/parser-typechecker/tests/Unison/Test/Codebase/Path.hs index 6b9c5085aa..6577425f34 100644 --- a/parser-typechecker/tests/Unison/Test/Codebase/Path.hs +++ b/parser-typechecker/tests/Unison/Test/Codebase/Path.hs @@ -9,7 +9,7 @@ import Data.Text import EasyTest import Unison.Codebase.Path import Unison.Codebase.Path.Parse -import qualified Unison.HashQualified' as HQ' +import qualified Unison.HashQualified2 as HQ' import Unison.NameSegment import qualified Unison.ShortHash as SH diff --git a/unison-cli/src/Unison/Cli/MonadUtils.hs b/unison-cli/src/Unison/Cli/MonadUtils.hs index 728390afdc..8924c6c573 100644 --- a/unison-cli/src/Unison/Cli/MonadUtils.hs +++ b/unison-cli/src/Unison/Cli/MonadUtils.hs @@ -98,7 +98,7 @@ import Unison.Codebase.Path (Path, Path' (..)) import qualified Unison.Codebase.Path as Path import Unison.Codebase.ShortCausalHash (ShortCausalHash) import qualified Unison.Codebase.ShortCausalHash as SCH -import qualified Unison.HashQualified' as HQ' +import qualified Unison.HashQualified2 as HQ' import Unison.NameSegment (NameSegment) import Unison.Parser.Ann (Ann (..)) import Unison.Prelude diff --git a/unison-cli/src/Unison/Codebase/Editor/HandleInput.hs b/unison-cli/src/Unison/Codebase/Editor/HandleInput.hs index 1b65914c5d..ff0ce89146 100644 --- a/unison-cli/src/Unison/Codebase/Editor/HandleInput.hs +++ b/unison-cli/src/Unison/Codebase/Editor/HandleInput.hs @@ -146,8 +146,8 @@ import Unison.Core.Project (ProjectAndBranch (..), ProjectBranchName, ProjectNam import qualified Unison.DataDeclaration as DD import qualified Unison.Hash as Hash import qualified Unison.HashQualified as HQ -import qualified Unison.HashQualified' as HQ' -import qualified Unison.HashQualified' as HashQualified +import qualified Unison.HashQualified2 as HQ' +import qualified Unison.HashQualified2 as HashQualified import qualified Unison.Hashing.V2.Convert as Hashing import Unison.LabeledDependency (LabeledDependency) import qualified Unison.LabeledDependency as LD @@ -184,7 +184,7 @@ import qualified Unison.Server.NameSearch.FromNames as NameSearch import Unison.Server.QueryResult import Unison.Server.SearchResult (SearchResult) import qualified Unison.Server.SearchResult as SR -import qualified Unison.Server.SearchResult' as SR' +import qualified Unison.Server.SearchResult2 as SR' import qualified Unison.Share.Codeserver as Codeserver import qualified Unison.ShortHash as SH import qualified Unison.Sqlite as Sqlite diff --git a/unison-cli/src/Unison/Codebase/Editor/Output.hs b/unison-cli/src/Unison/Codebase/Editor/Output.hs index 94fcbb580a..8c3e88baec 100644 --- a/unison-cli/src/Unison/Codebase/Editor/Output.hs +++ b/unison-cli/src/Unison/Codebase/Editor/Output.hs @@ -48,7 +48,7 @@ import Unison.Codebase.Type (GitError) import qualified Unison.CommandLine.InputPattern as Input import Unison.DataDeclaration (Decl) import qualified Unison.HashQualified as HQ -import qualified Unison.HashQualified' as HQ' +import qualified Unison.HashQualified2 as HQ' import Unison.LabeledDependency (LabeledDependency) import Unison.Name (Name) import Unison.NameSegment (NameSegment) @@ -64,7 +64,7 @@ import Unison.Reference (Reference, TermReference) import qualified Unison.Reference as Reference import Unison.Referent (Referent) import Unison.Server.Backend (ShallowListEntry (..)) -import Unison.Server.SearchResult' (SearchResult') +import Unison.Server.SearchResult2 (SearchResult') import qualified Unison.Share.Sync.Types as Sync import Unison.ShortHash (ShortHash) import Unison.Symbol (Symbol) diff --git a/unison-cli/src/Unison/Codebase/Editor/Output/BranchDiff.hs b/unison-cli/src/Unison/Codebase/Editor/Output/BranchDiff.hs index c468cd0c41..e10e4ad4a7 100644 --- a/unison-cli/src/Unison/Codebase/Editor/Output/BranchDiff.hs +++ b/unison-cli/src/Unison/Codebase/Editor/Output/BranchDiff.hs @@ -13,7 +13,7 @@ import qualified Unison.Codebase.Metadata as Metadata import qualified Unison.Codebase.Patch as P import Unison.DataDeclaration (DeclOrBuiltin) import qualified Unison.HashQualified as HQ -import Unison.HashQualified' (HashQualified) +import Unison.HashQualified2 (HashQualified) import Unison.Name (Name) import qualified Unison.Name as Name import Unison.Names (Names) diff --git a/unison-cli/src/Unison/Codebase/Editor/Slurp.hs b/unison-cli/src/Unison/Codebase/Editor/Slurp.hs index b1866a64fd..c01fa25ab5 100644 --- a/unison-cli/src/Unison/Codebase/Editor/Slurp.hs +++ b/unison-cli/src/Unison/Codebase/Editor/Slurp.hs @@ -21,7 +21,7 @@ import Unison.Parser.Ann (Ann) import Unison.Prelude import Unison.Referent (Referent) import qualified Unison.Referent as Referent -import qualified Unison.Referent' as Referent +import qualified Unison.GReferent as Referent import Unison.Symbol (Symbol) import qualified Unison.Syntax.Name as Name (toText, unsafeFromVar) import qualified Unison.UnisonFile as UF diff --git a/unison-cli/src/Unison/CommandLine/Completion.hs b/unison-cli/src/Unison/CommandLine/Completion.hs index 15984121f0..0f12716d6d 100644 --- a/unison-cli/src/Unison/CommandLine/Completion.hs +++ b/unison-cli/src/Unison/CommandLine/Completion.hs @@ -47,7 +47,7 @@ import qualified Unison.Codebase as Codebase import qualified Unison.Codebase.Path as Path import qualified Unison.Codebase.SqliteCodebase.Conversions as Cv import qualified Unison.CommandLine.InputPattern as IP -import qualified Unison.HashQualified' as HQ' +import qualified Unison.HashQualified2 as HQ' import Unison.NameSegment (NameSegment (NameSegment)) import qualified Unison.NameSegment as NameSegment import Unison.Prelude diff --git a/unison-cli/src/Unison/CommandLine/OutputMessages.hs b/unison-cli/src/Unison/CommandLine/OutputMessages.hs index 84ba48abbc..b7924a8387 100644 --- a/unison-cli/src/Unison/CommandLine/OutputMessages.hs +++ b/unison-cli/src/Unison/CommandLine/OutputMessages.hs @@ -108,7 +108,7 @@ import qualified Unison.Hash as Hash import Unison.Hash32 (Hash32) import qualified Unison.Hash32 as Hash32 import qualified Unison.HashQualified as HQ -import qualified Unison.HashQualified' as HQ' +import qualified Unison.HashQualified2 as HQ' import Unison.LabeledDependency as LD import Unison.Name (Name) import qualified Unison.Name as Name @@ -137,11 +137,11 @@ import Unison.Reference (Reference, TermReference) import qualified Unison.Reference as Reference import Unison.Referent (Referent) import qualified Unison.Referent as Referent -import qualified Unison.Referent' as Referent +import qualified Unison.GReferent as Referent import qualified Unison.Result as Result import Unison.Server.Backend (ShallowListEntry (..), TypeEntry (..)) import qualified Unison.Server.Backend as Backend -import qualified Unison.Server.SearchResult' as SR' +import qualified Unison.Server.SearchResult2 as SR' import qualified Unison.Share.Sync as Share import Unison.Share.Sync.Types (CodeserverTransportError (..)) import qualified Unison.ShortHash as SH diff --git a/unison-cli/src/Unison/LSP/Completion.hs b/unison-cli/src/Unison/LSP/Completion.hs index 03098bc556..871fc54bd0 100644 --- a/unison-cli/src/Unison/LSP/Completion.hs +++ b/unison-cli/src/Unison/LSP/Completion.hs @@ -21,7 +21,7 @@ import Language.LSP.Types.Lens import Unison.Codebase.Path (Path) import qualified Unison.Codebase.Path as Path import qualified Unison.HashQualified as HQ -import qualified Unison.HashQualified' as HQ' +import qualified Unison.HashQualified2 as HQ' import Unison.LSP.FileAnalysis import qualified Unison.LSP.Queries as LSPQ import Unison.LSP.Types @@ -40,7 +40,7 @@ import qualified Unison.Reference as Reference import qualified Unison.Referent as Referent import qualified Unison.Runtime.IOSource as IOSource import qualified Unison.Syntax.DeclPrinter as DeclPrinter -import qualified Unison.Syntax.HashQualified' as HQ' (toText) +import qualified Unison.Syntax.HashQualified2 as HQ' (toText) import qualified Unison.Syntax.Name as Name (fromText, toText) import qualified Unison.Syntax.TypePrinter as TypePrinter import qualified Unison.Util.Monoid as Monoid diff --git a/unison-cli/src/Unison/LSP/FileAnalysis.hs b/unison-cli/src/Unison/LSP/FileAnalysis.hs index bccd64783f..5578fca544 100644 --- a/unison-cli/src/Unison/LSP/FileAnalysis.hs +++ b/unison-cli/src/Unison/LSP/FileAnalysis.hs @@ -48,7 +48,7 @@ import Unison.Result (Note) import qualified Unison.Result as Result import Unison.Symbol (Symbol) import qualified Unison.Symbol as Symbol -import qualified Unison.Syntax.HashQualified' as HQ' (toText) +import qualified Unison.Syntax.HashQualified2 as HQ' (toText) import qualified Unison.Syntax.Lexer as L import qualified Unison.Syntax.Parser as Parser import qualified Unison.Syntax.TypePrinter as TypePrinter diff --git a/unison-core/src/Unison/DataDeclaration.hs b/unison-core/src/Unison/DataDeclaration.hs index 2177a34d92..c00b58cac6 100644 --- a/unison-core/src/Unison/DataDeclaration.hs +++ b/unison-core/src/Unison/DataDeclaration.hs @@ -53,7 +53,7 @@ import Unison.Prelude import Unison.Reference (Reference) import qualified Unison.Reference as Reference import qualified Unison.Referent as Referent -import qualified Unison.Referent' as Referent' +import qualified Unison.GReferent as Referent' import Unison.Term (Term) import qualified Unison.Term as Term import Unison.Type (Type) diff --git a/unison-core/src/Unison/Names.hs b/unison-core/src/Unison/Names.hs index 2372d0fc7d..694ff92bb9 100644 --- a/unison-core/src/Unison/Names.hs +++ b/unison-core/src/Unison/Names.hs @@ -58,7 +58,7 @@ import qualified Text.FuzzyFind as FZF import Unison.ConstructorReference (GConstructorReference (..)) import qualified Unison.ConstructorType as CT import qualified Unison.HashQualified as HQ -import qualified Unison.HashQualified' as HQ' +import qualified Unison.HashQualified2 as HQ' import Unison.LabeledDependency (LabeledDependency) import qualified Unison.LabeledDependency as LD import Unison.Name (Name) diff --git a/unison-core/src/Unison/NamesWithHistory.hs b/unison-core/src/Unison/NamesWithHistory.hs index 96749b0280..1162c31204 100644 --- a/unison-core/src/Unison/NamesWithHistory.hs +++ b/unison-core/src/Unison/NamesWithHistory.hs @@ -9,7 +9,7 @@ import Unison.ConstructorReference (ConstructorReference) import qualified Unison.ConstructorType as CT import Unison.HashQualified (HashQualified) import qualified Unison.HashQualified as HQ -import qualified Unison.HashQualified' as HQ' +import qualified Unison.HashQualified2 as HQ' import Unison.Name (Name) import qualified Unison.Name as Name import Unison.Names (Names (..)) diff --git a/unison-core/src/Unison/Referent.hs b/unison-core/src/Unison/Referent.hs index 0e72b3cce7..16fd61a785 100644 --- a/unison-core/src/Unison/Referent.hs +++ b/unison-core/src/Unison/Referent.hs @@ -38,7 +38,7 @@ import Unison.Prelude hiding (fold) import Unison.Reference (Reference, TermReference, TermReferenceId) import qualified Unison.Reference as R import qualified Unison.Reference as Reference -import Unison.Referent' (Referent' (..), reference_, toReference') +import Unison.GReferent (Referent' (..), reference_, toReference') import Unison.ShortHash (ShortHash) import qualified Unison.ShortHash as SH diff --git a/unison-core/unison-core1.cabal b/unison-core/unison-core1.cabal index a48c6efe94..3e2948ce70 100644 --- a/unison-core/unison-core1.cabal +++ b/unison-core/unison-core1.cabal @@ -1,6 +1,6 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.35.0. +-- This file has been generated from package.yaml by hpack version 0.35.1. -- -- see: https://github.com/sol/hpack @@ -31,9 +31,10 @@ library Unison.DataDeclaration Unison.DataDeclaration.ConstructorId Unison.DataDeclaration.Names + Unison.GReferent Unison.Hashable Unison.HashQualified - Unison.HashQualified' + Unison.HashQualified2 Unison.Kind Unison.LabeledDependency Unison.Name @@ -47,7 +48,6 @@ library Unison.Project Unison.Reference Unison.Referent - Unison.Referent' Unison.Settings Unison.ShortHash Unison.Symbol diff --git a/unison-share-api/src/Unison/Server/Backend.hs b/unison-share-api/src/Unison/Server/Backend.hs index 358490a61a..1bb105254d 100644 --- a/unison-share-api/src/Unison/Server/Backend.hs +++ b/unison-share-api/src/Unison/Server/Backend.hs @@ -138,7 +138,7 @@ import qualified Unison.ConstructorReference as ConstructorReference import qualified Unison.ConstructorType as CT import qualified Unison.DataDeclaration as DD import qualified Unison.HashQualified as HQ -import qualified Unison.HashQualified' as HQ' +import qualified Unison.HashQualified2 as HQ' import qualified Unison.Hashing.V2.Convert as Hashing import qualified Unison.LabeledDependency as LD import Unison.Name (Name) @@ -168,7 +168,7 @@ import Unison.Server.NameSearch.FromNames (makeNameSearch) import Unison.Server.NameSearch.Sqlite (termReferentsByShortHash, typeReferencesByShortHash) import Unison.Server.QueryResult import qualified Unison.Server.SearchResult as SR -import qualified Unison.Server.SearchResult' as SR' +import qualified Unison.Server.SearchResult2 as SR' import qualified Unison.Server.Syntax as Syntax import Unison.Server.Types import Unison.ShortHash @@ -177,7 +177,7 @@ import qualified Unison.Sqlite as Sqlite import Unison.Symbol (Symbol) import qualified Unison.Syntax.DeclPrinter as DeclPrinter import qualified Unison.Syntax.HashQualified as HQ (toText) -import qualified Unison.Syntax.HashQualified' as HQ' (toText) +import qualified Unison.Syntax.HashQualified2 as HQ' (toText) import Unison.Syntax.Name as Name (toText, unsafeFromText) import qualified Unison.Syntax.NamePrinter as NP import qualified Unison.Syntax.TermPrinter as TermPrinter diff --git a/unison-share-api/src/Unison/Server/NameSearch.hs b/unison-share-api/src/Unison/Server/NameSearch.hs index 0c8427f63e..e1bbd1b0cc 100644 --- a/unison-share-api/src/Unison/Server/NameSearch.hs +++ b/unison-share-api/src/Unison/Server/NameSearch.hs @@ -4,7 +4,7 @@ import Control.Lens import qualified Data.List as List import qualified Data.Set as Set import qualified Unison.HashQualified as HQ -import qualified Unison.HashQualified' as HQ' +import qualified Unison.HashQualified2 as HQ' import Unison.Name (Name) import Unison.Prelude import Unison.Reference (Reference) diff --git a/unison-share-api/src/Unison/Server/NameSearch/FromNames.hs b/unison-share-api/src/Unison/Server/NameSearch/FromNames.hs index 311fb2d96f..24f6a1bb05 100644 --- a/unison-share-api/src/Unison/Server/NameSearch/FromNames.hs +++ b/unison-share-api/src/Unison/Server/NameSearch/FromNames.hs @@ -1,6 +1,6 @@ module Unison.Server.NameSearch.FromNames where -import qualified Unison.HashQualified' as HQ' +import qualified Unison.HashQualified2 as HQ' import Unison.NamesWithHistory (NamesWithHistory) import qualified Unison.NamesWithHistory as NamesWithHistory import Unison.Reference (Reference) diff --git a/unison-share-api/src/Unison/Server/NameSearch/Sqlite.hs b/unison-share-api/src/Unison/Server/NameSearch/Sqlite.hs index c430f8adc4..c1b182d853 100644 --- a/unison-share-api/src/Unison/Server/NameSearch/Sqlite.hs +++ b/unison-share-api/src/Unison/Server/NameSearch/Sqlite.hs @@ -18,7 +18,7 @@ import qualified Unison.Codebase as Codebase import Unison.Codebase.Path import qualified Unison.Codebase.Path as Path import qualified Unison.Codebase.SqliteCodebase.Conversions as Cv -import qualified Unison.HashQualified' as HQ' +import qualified Unison.HashQualified2 as HQ' import qualified Unison.LabeledDependency as LD import Unison.Name (Name) import qualified Unison.Name as Name diff --git a/unison-share-api/src/Unison/Server/Orphans.hs b/unison-share-api/src/Unison/Server/Orphans.hs index d731007ab4..04fe81bb32 100644 --- a/unison-share-api/src/Unison/Server/Orphans.hs +++ b/unison-share-api/src/Unison/Server/Orphans.hs @@ -26,7 +26,7 @@ import Unison.ConstructorType (ConstructorType) import Unison.Hash (Hash (..)) import qualified Unison.Hash as Hash import qualified Unison.HashQualified as HQ -import qualified Unison.HashQualified' as HQ' +import qualified Unison.HashQualified2 as HQ' import Unison.Name (Name) import qualified Unison.Name as Name import Unison.NameSegment (NameSegment (..)) @@ -37,7 +37,7 @@ import qualified Unison.Referent as Referent import Unison.ShortHash (ShortHash) import qualified Unison.ShortHash as SH import qualified Unison.Syntax.HashQualified as HQ (fromText) -import qualified Unison.Syntax.HashQualified' as HQ' (fromText) +import qualified Unison.Syntax.HashQualified2 as HQ' (fromText) import qualified Unison.Syntax.Name as Name (fromTextEither, toText) import Unison.Util.Pretty (Width (..)) diff --git a/unison-share-api/src/Unison/Server/SearchResult.hs b/unison-share-api/src/Unison/Server/SearchResult.hs index 5a9efc4ceb..63bb6ad791 100644 --- a/unison-share-api/src/Unison/Server/SearchResult.hs +++ b/unison-share-api/src/Unison/Server/SearchResult.hs @@ -2,7 +2,7 @@ module Unison.Server.SearchResult where import qualified Data.Set as Set import Unison.HashQualified (HashQualified) -import qualified Unison.HashQualified' as HQ' +import qualified Unison.HashQualified2 as HQ' import Unison.Name (Name) import qualified Unison.Name as Name import Unison.Names (Names (..)) diff --git a/unison-share-api/src/Unison/Server/Types.hs b/unison-share-api/src/Unison/Server/Types.hs index 80af376e64..2277d7ee27 100644 --- a/unison-share-api/src/Unison/Server/Types.hs +++ b/unison-share-api/src/Unison/Server/Types.hs @@ -41,7 +41,7 @@ import Unison.Codebase.Editor.DisplayObject ) import qualified Unison.Hash as Hash import qualified Unison.HashQualified as HQ -import qualified Unison.HashQualified' as HQ' +import qualified Unison.HashQualified2 as HQ' import Unison.Name (Name) import Unison.NameSegment (NameSegment) import qualified Unison.NameSegment as NameSegment diff --git a/unison-share-api/src/Unison/Util/Find.hs b/unison-share-api/src/Unison/Util/Find.hs index f2fb30a7e1..ecdd0ce5eb 100644 --- a/unison-share-api/src/Unison/Util/Find.hs +++ b/unison-share-api/src/Unison/Util/Find.hs @@ -16,7 +16,7 @@ import qualified Data.Text as Text -- https://www.stackage.org/haddock/lts-13.9/regex-tdfa-1.2.3.1/Text-Regex-TDFA.html import qualified Text.Regex.TDFA as RE import qualified Unison.HashQualified as HQ -import qualified Unison.HashQualified' as HQ' +import qualified Unison.HashQualified2 as HQ' import Unison.Name (Name) import qualified Unison.Name as Name import Unison.Names (Names) diff --git a/unison-share-api/unison-share-api.cabal b/unison-share-api/unison-share-api.cabal index 9627839333..17b3587b14 100644 --- a/unison-share-api/unison-share-api.cabal +++ b/unison-share-api/unison-share-api.cabal @@ -36,7 +36,7 @@ library Unison.Server.Orphans Unison.Server.QueryResult Unison.Server.SearchResult - Unison.Server.SearchResult' + Unison.Server.SearchResult2 Unison.Server.Share.Definitions Unison.Server.Share.RenderDoc Unison.Server.Syntax diff --git a/unison-syntax/src/Unison/Syntax/HashQualified2.hs b/unison-syntax/src/Unison/Syntax/HashQualified2.hs index a17155a85e..230b76bc9e 100644 --- a/unison-syntax/src/Unison/Syntax/HashQualified2.hs +++ b/unison-syntax/src/Unison/Syntax/HashQualified2.hs @@ -11,7 +11,7 @@ module Unison.Syntax.HashQualified2 where import qualified Data.Text as Text -import qualified Unison.HashQualified2' as HQ' +import qualified Unison.HashQualified2 as HQ' import Unison.Name (Name, Parse) import qualified Unison.Name as Name import Unison.Prelude hiding (fromString) diff --git a/unison-syntax/unison-syntax.cabal b/unison-syntax/unison-syntax.cabal index 77c7ec8658..635e71e108 100644 --- a/unison-syntax/unison-syntax.cabal +++ b/unison-syntax/unison-syntax.cabal @@ -20,7 +20,7 @@ library Unison.Lexer.Pos Unison.Parser.Ann Unison.Syntax.HashQualified - Unison.Syntax.HashQualified' + Unison.Syntax.HashQualified2 Unison.Syntax.Lexer Unison.Syntax.Name Unison.Syntax.Parser From e4cb620d60ab6f8bfe4c168ee9f4e4ee8976ba34 Mon Sep 17 00:00:00 2001 From: Arya Irani Date: Tue, 23 May 2023 16:21:33 -0400 Subject: [PATCH 10/11] re-rename --- lib/unison-pretty-printer/src/Unison/Util/SyntaxText.hs | 2 +- .../Codebase/SqliteCodebase/Migrations/MigrateSchema1To2.hs | 2 +- unison-cli/src/Unison/Codebase/Editor/Slurp.hs | 2 +- unison-cli/src/Unison/CommandLine/OutputMessages.hs | 2 +- unison-core/src/Unison/DataDeclaration.hs | 2 +- unison-core/src/Unison/Referent.hs | 2 +- unison-core/src/Unison/{GReferent.hs => ReferentG.hs} | 4 ++-- unison-core/unison-core1.cabal | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) rename unison-core/src/Unison/{GReferent.hs => ReferentG.hs} (97%) diff --git a/lib/unison-pretty-printer/src/Unison/Util/SyntaxText.hs b/lib/unison-pretty-printer/src/Unison/Util/SyntaxText.hs index bb82c32ebc..7e7f62204c 100644 --- a/lib/unison-pretty-printer/src/Unison/Util/SyntaxText.hs +++ b/lib/unison-pretty-printer/src/Unison/Util/SyntaxText.hs @@ -4,7 +4,7 @@ import Unison.HashQualified (HashQualified) import Unison.Name (Name) import Unison.Pattern (SeqOp) import Unison.Prelude -import Unison.GReferent (Referent') +import Unison.ReferentG (Referent') import Unison.Util.AnnotatedText (AnnotatedText (..), annotate, segment) type SyntaxText' r = AnnotatedText (Element r) diff --git a/parser-typechecker/src/Unison/Codebase/SqliteCodebase/Migrations/MigrateSchema1To2.hs b/parser-typechecker/src/Unison/Codebase/SqliteCodebase/Migrations/MigrateSchema1To2.hs index 9c10e0b136..7f60f2f4be 100644 --- a/parser-typechecker/src/Unison/Codebase/SqliteCodebase/Migrations/MigrateSchema1To2.hs +++ b/parser-typechecker/src/Unison/Codebase/SqliteCodebase/Migrations/MigrateSchema1To2.hs @@ -72,7 +72,7 @@ import qualified Unison.Pattern as Pattern import Unison.Prelude import qualified Unison.Reference as Reference import qualified Unison.Referent as Referent -import qualified Unison.GReferent as Referent' +import qualified Unison.ReferentG as Referent' import qualified Unison.Sqlite as Sqlite import Unison.Symbol (Symbol) import qualified Unison.Term as Term diff --git a/unison-cli/src/Unison/Codebase/Editor/Slurp.hs b/unison-cli/src/Unison/Codebase/Editor/Slurp.hs index c01fa25ab5..80e81670c0 100644 --- a/unison-cli/src/Unison/Codebase/Editor/Slurp.hs +++ b/unison-cli/src/Unison/Codebase/Editor/Slurp.hs @@ -21,7 +21,7 @@ import Unison.Parser.Ann (Ann) import Unison.Prelude import Unison.Referent (Referent) import qualified Unison.Referent as Referent -import qualified Unison.GReferent as Referent +import qualified Unison.ReferentG as Referent import Unison.Symbol (Symbol) import qualified Unison.Syntax.Name as Name (toText, unsafeFromVar) import qualified Unison.UnisonFile as UF diff --git a/unison-cli/src/Unison/CommandLine/OutputMessages.hs b/unison-cli/src/Unison/CommandLine/OutputMessages.hs index b7924a8387..85a9aa9e2b 100644 --- a/unison-cli/src/Unison/CommandLine/OutputMessages.hs +++ b/unison-cli/src/Unison/CommandLine/OutputMessages.hs @@ -137,7 +137,7 @@ import Unison.Reference (Reference, TermReference) import qualified Unison.Reference as Reference import Unison.Referent (Referent) import qualified Unison.Referent as Referent -import qualified Unison.GReferent as Referent +import qualified Unison.ReferentG as Referent import qualified Unison.Result as Result import Unison.Server.Backend (ShallowListEntry (..), TypeEntry (..)) import qualified Unison.Server.Backend as Backend diff --git a/unison-core/src/Unison/DataDeclaration.hs b/unison-core/src/Unison/DataDeclaration.hs index c00b58cac6..768339899d 100644 --- a/unison-core/src/Unison/DataDeclaration.hs +++ b/unison-core/src/Unison/DataDeclaration.hs @@ -53,7 +53,7 @@ import Unison.Prelude import Unison.Reference (Reference) import qualified Unison.Reference as Reference import qualified Unison.Referent as Referent -import qualified Unison.GReferent as Referent' +import qualified Unison.ReferentG as Referent' import Unison.Term (Term) import qualified Unison.Term as Term import Unison.Type (Type) diff --git a/unison-core/src/Unison/Referent.hs b/unison-core/src/Unison/Referent.hs index 16fd61a785..ba046dfe3d 100644 --- a/unison-core/src/Unison/Referent.hs +++ b/unison-core/src/Unison/Referent.hs @@ -38,7 +38,7 @@ import Unison.Prelude hiding (fold) import Unison.Reference (Reference, TermReference, TermReferenceId) import qualified Unison.Reference as R import qualified Unison.Reference as Reference -import Unison.GReferent (Referent' (..), reference_, toReference') +import Unison.ReferentG (Referent' (..), reference_, toReference') import Unison.ShortHash (ShortHash) import qualified Unison.ShortHash as SH diff --git a/unison-core/src/Unison/GReferent.hs b/unison-core/src/Unison/ReferentG.hs similarity index 97% rename from unison-core/src/Unison/GReferent.hs rename to unison-core/src/Unison/ReferentG.hs index 9123532a0a..0dd48e3a12 100644 --- a/unison-core/src/Unison/GReferent.hs +++ b/unison-core/src/Unison/ReferentG.hs @@ -1,12 +1,12 @@ {-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE PatternSynonyms #-} -module Unison.GReferent +module Unison.ReferentG ( Referent' (..), -- * Basic queries isConstructor, - Unison.GReferent.fold, + Unison.ReferentG.fold, -- * Lenses reference_, diff --git a/unison-core/unison-core1.cabal b/unison-core/unison-core1.cabal index 3e2948ce70..cd869314cf 100644 --- a/unison-core/unison-core1.cabal +++ b/unison-core/unison-core1.cabal @@ -31,7 +31,7 @@ library Unison.DataDeclaration Unison.DataDeclaration.ConstructorId Unison.DataDeclaration.Names - Unison.GReferent + Unison.ReferentG Unison.Hashable Unison.HashQualified Unison.HashQualified2 From 64865b85071731b9c29083db70ebf7046b043431 Mon Sep 17 00:00:00 2001 From: Chris Penner Date: Tue, 23 May 2023 09:14:08 -0600 Subject: [PATCH 11/11] Remove uni-patterns --- unison-share-api/src/Unison/Server/Doc.hs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/unison-share-api/src/Unison/Server/Doc.hs b/unison-share-api/src/Unison/Server/Doc.hs index f2ca348461..62c79672c9 100644 --- a/unison-share-api/src/Unison/Server/Doc.hs +++ b/unison-share-api/src/Unison/Server/Doc.hs @@ -5,7 +5,6 @@ {-# LANGUAGE ScopedTypeVariables #-} {-# LANGUAGE StandaloneDeriving #-} {-# LANGUAGE ViewPatterns #-} -{-# OPTIONS_GHC -Wno-incomplete-uni-patterns #-} module Unison.Server.Doc where @@ -360,7 +359,9 @@ evalDoc terms typeOf eval types tm = in goSignatures rs <&> \s -> ESignature s -- SignatureInline Doc2.Term DD.Doc2SpecialFormSignatureInline (DD.Doc2Term (Term.Referent' r)) -> - goSignatures [r] <&> \[s] -> ESignatureInline s + goSignatures [r] <&> \case + [s] -> ESignatureInline s + _ -> error "impossible error: evalDoc: expected exactly one signature" -- Eval Doc2.Term DD.Doc2SpecialFormEval (DD.Doc2Term tm) -> do result <- eval tm