Merge branch 'master' into cache-dist-newstyle

Author: Patrick Thomson

README.md

@@ -108,7 +108,7 @@ cabal new-test
 cabal new-run semantic -- --help
 ```
 
-`semantic` requires at least GHC 8.6.4. We recommend using [`ghcup`][ghcup] to sandbox GHC versions. Our version bounds are based on [Stackage][stackage] LTS versions. The current LTS version is 13.13. `stack` as a build tool is not officially supported; there is an unofficial [`stack.yaml`](https://gist.github.com/jkachmar/f200caee83280f1f25e9cfa2dd2b16bb) available, though we cannot make guarantees as to its stability.
+`semantic` requires at least GHC 8.6.4 and Cabal 2.4. We recommend using [`ghcup`][ghcup] to sandbox GHC versions. `stack` as a build tool is not officially supported; there is an unofficial [`stack.yaml`](https://gist.github.com/jkachmar/f200caee83280f1f25e9cfa2dd2b16bb) available, though we cannot make guarantees as to its stability.
 
 [nix]: https://www.haskell.org/cabal/users-guide/nix-local-build-overview.html
 [stackage]: https://stackage.org

src/Data/Language.hs

@@ -17,7 +17,6 @@ import           Data.Char (toUpper)
 import           Data.String
 import qualified Data.Text as T
 import           Prologue
-import           Proto3.Suite
 import           System.FilePath.Posix
 
 -- | The various languages we support.
@@ -37,7 +36,7 @@ data Language
     | TypeScript
     | PHP
     | TSX
-    deriving (Eq, Generic, Ord, Read, Show, Bounded, Hashable, ToJSON, Named, Enum, MessageField, NFData)
+    deriving (Eq, Generic, Ord, Read, Show, Bounded, Hashable, ToJSON, Enum, NFData)
 
 class SLanguage (lang :: Language) where
   reflect :: proxy lang -> Language
@@ -78,12 +77,6 @@ instance SLanguage 'TypeScript where
 instance SLanguage 'PHP where
   reflect _ = PHP
 
-
--- This ensures that the protobuf file is generated with ALL_CAPS_NAMES.
-instance Finite Language where
-  enumerate _ = fmap go [Unknown ..] where
-    go x = (fromString (fmap toUpper (show x)), fromEnum x)
-
 instance FromJSON Language where
   parseJSON = withText "Language" $ \l ->
     pure $ fromMaybe Unknown (parseLanguage l)
@@ -107,18 +100,6 @@ parseLanguage l = case T.toLower l of
 knownLanguage :: Language -> Bool
 knownLanguage = (/= Unknown)
 
--- | Defaults to 'Unknown'.
-instance HasDefault Language where def = Unknown
-
--- | Piggybacks on top of the 'Enumerated' instance, as the generated code would.
--- This instance will get easier when we have DerivingVia.
-instance Primitive Language where
-  primType _ = primType (Proxy @(Enumerated Language))
-  encodePrimitive f = encodePrimitive f . Enumerated . Right
-  decodePrimitive   = decodePrimitive >>= \case
-    (Enumerated (Right r)) -> pure r
-    other                  -> Prelude.fail ("Language decodeMessageField: unexpected value" <> show other)
-
 -- | Returns a Language based on the file extension (including the ".").
 languageForType :: String -> Language
 languageForType mediaType = case mediaType of

src/Semantic/CLI.hs

@@ -1,4 +1,4 @@
-{-# LANGUAGE ApplicativeDo, RankNTypes #-}
+{-# LANGUAGE ApplicativeDo #-}
 module Semantic.CLI (main) where
 
 import           Control.Exception as Exc (displayException)