Merge pull request github#618 from github/eight-dot-ten-patrickt

Update to GHC v8.10.1

Author: rewinfrey

.ghci.repl

@@ -24,7 +24,11 @@
 :seti -Wno-safe
 :seti -Wno-unsafe
 :seti -Wno-star-is-type
+-- 8.8+
 :seti -Wno-missing-deriving-strategies
+-- 8.10+
+:seti -Wno-missing-safe-haskell-mode
+:seti -Wno-prepositive-qualified-module
 
 -- Turn on some language extensions you use a lot
 :seti -XFlexibleContexts -XOverloadedStrings -XTypeApplications
@@ -44,5 +48,6 @@
 -- Better typed holes
 :set -funclutter-valid-hole-fits -fabstract-refinement-hole-fits -frefinement-level-hole-fits=2
 
--- This usually impairs understanding
+-- We have this one on in the project but not in the REPL to reduce noise
 :seti -Wno-type-defaults
+:set -Wno-unused-packages

.github/workflows/bazel.yml

@@ -3,10 +3,10 @@ name: Bazel CI
 on:
   # Trigger the workflow on push or pull request,
   # but only for the master branch
-  push:
-    branches:
-      - master
-  pull_request:
+  # push:
+  #   branches:
+  #     - master
+  # pull_request: {}
 
 jobs:
   build:
@@ -40,5 +40,6 @@ jobs:
 
     - name: Build & test
       run: |
-        bin/bazel test --config=ci --test_tag_filters=language-test //...
-        bin/bazel test --config=ci //semantic-source //semantic:spec
+        bin/bazel clean
+        bin/bazel test --sandbox_debug --config=ci --test_tag_filters=language-test //...
+        bin/bazel test --sandbox_debug --config=ci //semantic-source //semantic:spec

.github/workflows/haskell.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ghc: ["8.8.3"]
+        ghc: ["8.8.3", "8.10.1"]
         cabal: ["3.2.0.0"]
 
     steps:
@@ -69,7 +69,6 @@ jobs:
         cabal v2-run   --project-file=cabal.project.ci semantic-tsx:test
         cabal v2-run   --project-file=cabal.project.ci semantic-typescript:test
         cabal v2-run   --project-file=cabal.project.ci semantic-source:test
-        cabal v2-run   --project-file=cabal.project.ci semantic-source:doctest -- semantic-source/src
 
     - name: Write out cache
       run: ./cabal-cache sync-to-archive --threads=2 --archive-uri=dist-cache

WORKSPACE

@@ -15,18 +15,11 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 # an updated version.
 #
 # [1] https://github.com/tweag/rules_haskell/issues/1349
-#
-# http_archive(
-#     name = "rules_haskell",
-#     sha256 = "56a8e6337df8802f1e0e7d2b3d12d12d5d96c929c8daecccc5738a0f41d9c1e4",
-#     strip_prefix = "rules_haskell-0.12",
-#     urls = ["https://github.com/tweag/rules_haskell/archive/v0.12.tar.gz"],
-# )
 http_archive(
     name = "rules_haskell",
-    sha256 = "78d017aa732b430c0681fff4514503af78a8d8c44df165e603a9433745b16e5e",
-    strip_prefix = "rules_haskell-abaec6502a4474f10b3c367fb5e90173ee0e349c",
-    urls = ["https://github.com/tweag/rules_haskell/archive/abaec6502a4474f10b3c367fb5e90173ee0e349c.tar.gz"],
+    sha256 = "5e8077ae243b4bcf7bb913dfd9b4335c3b4bd2554658c62db7b3eb5351c80d8e",
+    strip_prefix = "rules_haskell-aabeedc18f5e5db030ca1aa0c10a7dc14e4a4a55",
+    urls = ["https://github.com/tweag/rules_haskell/archive/aabeedc18f5e5db030ca1aa0c10a7dc14e4a4a55.tar.gz"],
 )
 
 load(
@@ -45,7 +38,7 @@ load(
 # Download a GHC binary distribution from haskell.org and register it as a toolchain.
 rules_haskell_toolchains(
     locale = "en_US.UTF-8",
-    version = "8.8.3",
+    version = "8.10.1",
 )
 
 # Enable GHC persistent worker mode, if that's your bag.
@@ -75,6 +68,7 @@ stack_snapshot(
         "async",
         "attoparsec",
         "base",
+        "base64-bytestring",
         "bazel-runfiles",
         "bifunctors",
         "bytestring",
@@ -100,7 +94,9 @@ stack_snapshot(
         "hspec",
         "hspec-core",
         "hspec-expectations",
+        "proto-lens-jsonpb",
         "lens",
+        "lingo",
         "network",
         "network-uri",
         "optparse-applicative",
@@ -112,7 +108,6 @@ stack_snapshot(
         "prettyprinter-ansi-terminal",
         "process",
         "proto-lens",
-        "proto-lens-jsonpb",
         "proto-lens-runtime",
         "raw-strings-qq",
         "recursion-schemes",
@@ -243,15 +238,6 @@ tree_sitter_node_types_hackage(
     version = "0.1.0.1",
 )
 
-# Download lingo (which has its own Bazel build instructions).
-
-http_archive(
-    name = "lingo",
-    sha256 = "32a5e2d66e4620ff7004acab4802dc948b852ce26725012283a85d41af97275f",
-    strip_prefix = "lingo-haskell-6614b9afe1a519364491c170d6b06ff5cd96153a",
-    urls = ["https://github.com/tclem/lingo-haskell/archive/6614b9afe1a519364491c170d6b06ff5cd96153a.tar.gz"],
-)
-
 load("//:build/example_repos.bzl", "declare_example_repos")
 
 declare_example_repos()

build/common.bzl

@@ -31,6 +31,9 @@ GHC_FLAGS = [
     "-Wno-star-is-type",
     "-Wno-missing-deriving-strategies",
     "-DBAZEL_BUILD=1",
+    "-Wno-unused-packages",
+    "-Wno-prepositive-qualified-module",
+    "-Wno-missing-safe-haskell-mode",
 ] + select(
     {
         "//:release": RELEASE_GHC_FLAGS,
@@ -126,7 +129,6 @@ def semantic_language_library(language, name, srcs, ts_package = "", nodetypes =
             "@stackage//:fused-effects",
             "@stackage//:fused-syntax",
             "@stackage//:generic-lens",
-            "@stackage//:generic-monoid",
             "@stackage//:hashable",
             "@stackage//:lens",
             "@stackage//:pathtype",

cabal.project

@@ -21,13 +21,6 @@ packages: semantic
           semantic-tsx
           semantic-typescript
 
--- Packages brought in from other repos instead of hackage
--- ATTENTION: remember to update cabal.project.ci when bumping SHAs here!
-source-repository-package
-  type: git
-  location: https://github.com/tclem/proto-lens-jsonpb
-  tag: 5d40444be689bef1e12cbe38da0261283775ec64
-
 source-repository-package
   type: git
   location: https://github.com/antitypical/fused-syntax.git

cabal.project.ci

@@ -21,13 +21,6 @@ packages: semantic
           semantic-tsx
           semantic-typescript
 
--- Packages brought in from other repos instead of hackage
--- ATTENTION: remember to update cabal.project when bumping SHAs here!
-source-repository-package
-  type: git
-  location: https://github.com/tclem/proto-lens-jsonpb
-  tag: 5d40444be689bef1e12cbe38da0261283775ec64
-
 source-repository-package
   type: git
   location: https://github.com/antitypical/fused-syntax.git

script/ghci-flags

@@ -46,6 +46,8 @@ function flags {
 
   echo "-optP-Wno-macro-redefined"
 
+  echo "-DBAZEL_BUILD=0"
+
   # .hs source dirs
   # TODO: would be nice to figure this out from cabal.project & the .cabal files
   echo "-isemantic/app"
@@ -98,8 +100,9 @@ function flags {
   echo "-Wno-name-shadowing"
   echo "-Wno-safe"
   echo "-Wno-unsafe"
-  [[ "$ghc_version" = 8.6.* ]] || [[ "$ghc_version" = 8.8.* ]] && echo "-Wno-star-is-type" || true
-  [[ "$ghc_version" = 8.8.* ]] && echo "-Wno-missing-deriving-strategies" || true
+  [[ "$ghc_version" = 8.6.* ]] || [[ "$ghc_version" = 8.8.* ]] || [[ "$ghc_version" = 8.10.* ]] && echo "-Wno-star-is-type" || true
+  [[ "$ghc_version" = 8.8.* ]] || [[ "$ghc_version" = 8.10.* ]] && echo "-Wno-missing-deriving-strategies" || true
+  [[ "$ghc_version" = 8.10.* ]] && echo "-Wno-missing-safe-haskell-mode" && echo "-Wno-prepositive-qualified-module" && echo "-Wno-unused-packages"
 }
 
 flags > "$output_file"

semantic-analysis/semantic-analysis.cabal

@@ -35,6 +35,10 @@ common common
     -Wno-star-is-type
   if (impl(ghc >= 8.8))
     ghc-options: -Wno-missing-deriving-strategies
+  if (impl(ghc >= 8.10))
+    ghc-options:
+      -Wno-missing-safe-haskell-mode
+      -Wno-prepositive-qualified-module
 
 library
   import: common
@@ -63,19 +67,10 @@ library
     , algebraic-graphs            ^>= 0.3
     , base                         >= 4.13 && < 5
     , containers                  ^>= 0.6
-    , filepath
     , fused-effects               ^>= 1.1
-    , fused-effects-readline      ^>= 0.1
     , fused-syntax
     , hashable
-    , haskeline                   ^>= 0.7.5
-    , hashable
-    , lingo                       ^>= 0.3.2.0
     , pathtype                    ^>= 0.8.1
-    , prettyprinter                >= 1.2 && < 2
-    , prettyprinter-ansi-terminal ^>= 1.1.1
-    , semantic-source             ^>= 0.1.0
-    , semilattices
-    , terminal-size               ^>= 0.3
+    , semantic-source             ^>= 0.1.0.1
     , text                        ^>= 1.2.3.1
     , transformers                ^>= 0.5

semantic-ast/semantic-ast.cabal

@@ -34,6 +34,10 @@ common haskell
     -Wno-star-is-type
   if (impl(ghc >= 8.8))
     ghc-options: -Wno-missing-deriving-strategies
+  if (impl(ghc >= 8.10))
+    ghc-options:
+      -Wno-missing-safe-haskell-mode
+      -Wno-prepositive-qualified-module
   cpp-options:
     -DBAZEL_BUILD=0
 
@@ -56,31 +60,24 @@ library
 
   -- other-modules:
   -- other-extensions:
-  build-depends:       base ^>= 4.13
-                     , aeson                ^>= 1.4.2.0
-                     , aeson-pretty         ^>= 0.8.8
-                     , bytestring           ^>= 0.10.9
-                     , containers            >= 0.6.0.1
-                     , directory            ^>= 1.3.3.2
-                     , filepath             ^>= 1.4.1
-                     , fused-effects        ^>= 1.1
-                     , tree-sitter          ^>= 0.9.0.0
-                     , semantic-source      ^>= 0.1.0
-                     , template-haskell     ^>= 2.15
-                     , bytestring           ^>= 0.10.8.2
-                     , optparse-applicative >= 0.14.3 && < 0.16
-                     , pretty-simple        ^>= 3.1.0.0
-                     , tree-sitter-python   ^>= 0.9.0.1
-                     , text                 ^>= 1.2.3.1
-                     , unordered-containers ^>= 0.2.10
-                     , hedgehog              >= 0.6 && <2
-                     , pathtype             ^>= 0.8.1
-                     , Glob                 ^>= 0.10.0
-                     , attoparsec           ^>= 0.13.2.2
-                     , text                 ^>= 1.2.3
-                     , tasty                ^>= 1.2.3
-                     , tasty-hedgehog       ^>= 1.0.0.1
-                     , tasty-hunit          ^>= 0.10.0.2
+  build-depends:
+    , aeson                ^>= 1.4.2.0
+    , attoparsec           ^>= 0.13.2.2
+    , base                  >= 4.13 && < 5
+    , bytestring           ^>= 0.10.9
+    , containers            >= 0.6.0.1
+    , directory            ^>= 1.3.3.2
+    , filepath             ^>= 1.4.1
+    , fused-effects        ^>= 1.1
+    , Glob                 ^>= 0.10.0
+    , pathtype             ^>= 0.8.1
+    , semantic-source      ^>= 0.1.0.1
+    , tasty                ^>= 1.2.3
+    , tasty-hunit          ^>= 0.10.0.2
+    , template-haskell      >= 2.15 && < 2.17
+    , text                 ^>= 1.2.3.1
+    , tree-sitter          ^>= 0.9.0.0
+    , unordered-containers ^>= 0.2.10
 
   hs-source-dirs:      src
   default-language:    Haskell2010