Bump to lts-15.13

unisonweb · May 24, 2020 · 3f4e8a4 · 3f4e8a4
1 parent 7f6a3cc
commit 3f4e8a4
Show file tree

Hide file tree

Showing 36 changed files with 156 additions and 78 deletions.
diff --git a/deps/fsutils b/deps/fsutils
@@ -0,0 +1,7 @@
+Copyright (c) 2012 Anthony Grimes
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/parser-typechecker/src/Unison/Codebase/BranchDiff.hs b/parser-typechecker/src/Unison/Codebase/BranchDiff.hs
@@ -1,8 +1,6 @@
 module Unison.Codebase.BranchDiff where
 
 import Unison.Prelude
-import Data.Map (Map)
-import Data.Set (Set)
 import qualified Data.Set as Set
 import qualified Data.Map as Map
 import Unison.Codebase.Branch (Branch0(..))

diff --git a/parser-typechecker/src/Unison/Codebase/Editor/HandleInput.hs b/parser-typechecker/src/Unison/Codebase/Editor/HandleInput.hs
@@ -42,13 +42,12 @@ import qualified Unison.CommandLine.InputPattern as InputPattern
 import qualified Unison.CommandLine.InputPatterns as InputPatterns
 
 import           Control.Lens
-import           Control.Lens.TH                ( makeLenses )
 import           Control.Monad.State            ( StateT )
 import           Control.Monad.Except           ( ExceptT(..), runExceptT, withExceptT)
 import           Data.Bifunctor                 ( second, first )
 import           Data.Configurator              ()
 import qualified Data.List                      as List
-import           Data.List                      ( partition, sortOn )
+import           Data.List                      ( partition )
 import           Data.List.Extra                ( nubOrd, sort )
 import qualified Data.Map                      as Map
 import qualified Data.Text                     as Text

diff --git a/parser-typechecker/src/Unison/Codebase/Editor/Output/BranchDiff.hs b/parser-typechecker/src/Unison/Codebase/Editor/Output/BranchDiff.hs
@@ -25,7 +25,6 @@ import Unison.HashQualified' (HashQualified)
 import qualified Unison.HashQualified as HQ
 import qualified Unison.Referent as Referent
 import Unison.Referent (Referent)
-import Data.Set (Set)
 import qualified Unison.Names2 as Names2
 import Unison.Names3 (Names0)
 import Unison.DataDeclaration (DeclOrBuiltin)

diff --git a/parser-typechecker/src/Unison/Codebase/Editor/Propagate.hs b/parser-typechecker/src/Unison/Codebase/Editor/Propagate.hs
@@ -179,7 +179,7 @@ propagate patch b = case validatePatch patch of
                     "This reference is not a term nor a type " <> show r
                   mmayEdits | haveTerm  = doTerm r
                             | haveType  = doType r
-                            | otherwise = fail message
+                            | otherwise = error message
               mayEdits <- mmayEdits
               case mayEdits of
                 (Nothing    , seen') -> collectEdits es seen' todo
@@ -206,7 +206,7 @@ propagate patch b = case validatePatch patch of
                           $ view _2 <$> declMap
           hashedComponents' <- case hashedDecls of
             Left _ ->
-              fail
+              error
                 $ "Edit propagation failed because some of the dependencies of "
                 <> show r
                 <> " could not be resolved."
@@ -349,13 +349,13 @@ propagate patch b = case validatePatch patch of
           :: Reference -> F m i v (Maybe (Reference, (Term v Ann, Type v Ann)))
         termInfo termRef = do
           tpm <- eval $ LoadTypeOfTerm termRef
-          tp  <- maybe (fail $ "Missing type for term " <> show termRef)
+          tp  <- maybe (error $ "Missing type for term " <> show termRef)
                        pure
                        tpm
           case termRef of
             Reference.DerivedId id -> do
               mtm <- eval $ LoadTerm id
-              tm  <- maybe (fail $ "Missing term with id " <> show id) pure mtm
+              tm  <- maybe (error $ "Missing term with id " <> show id) pure mtm
               pure $ Just (termRef, (tm, tp))
             Reference.Builtin{} -> pure Nothing
         unhash m =
@@ -376,7 +376,7 @@ propagate patch b = case validatePatch patch of
       typeInfo typeRef = case typeRef of
         Reference.DerivedId id -> do
           declm <- eval $ LoadType id
-          decl  <- maybe (fail $ "Missing type declaration " <> show typeRef)
+          decl  <- maybe (error $ "Missing type declaration " <> show typeRef)
                          pure
                          declm
           pure $ Just (typeRef, decl)

diff --git a/parser-typechecker/src/Unison/Codebase/Editor/UriParser.hs b/parser-typechecker/src/Unison/Codebase/Editor/UriParser.hs
@@ -7,7 +7,6 @@ import qualified Text.Megaparsec.Char.Lexer as L
 import qualified Text.Megaparsec.Char as C
 import Data.Text as Text
 
-import Data.Text (Text)
 import Unison.Codebase.Path (Path(..))
 import qualified Unison.Codebase.Path as Path
 import Unison.Codebase.Editor.RemoteRepo (RemoteRepo(..), RemoteNamespace)

diff --git a/parser-typechecker/src/Unison/Codebase/FileCodebase.hs b/parser-typechecker/src/Unison/Codebase/FileCodebase.hs
@@ -31,8 +31,7 @@ import qualified Data.Text.IO                  as TextIO
 import           UnliftIO.Directory             ( createDirectoryIfMissing
                                                 , doesDirectoryExist
                                                 )
-import           System.FilePath                ( FilePath
-                                                , takeFileName
+import           System.FilePath                ( takeFileName
                                                 )
 import           System.Directory               ( getHomeDirectory
                                                 , canonicalizePath

diff --git a/parser-typechecker/src/Unison/Codebase/FileCodebase/Common.hs b/parser-typechecker/src/Unison/Codebase/FileCodebase/Common.hs
@@ -74,23 +74,19 @@ import           Control.Error (runExceptT, ExceptT(..))
 import           Control.Lens (Lens, use, to, (%=))
 import           Control.Monad.Catch (catch)
 import           Control.Monad.State (MonadState)
+import qualified Data.ByteString.Base16 as ByteString (decodeBase16, encodeBase16)
 import qualified Data.Char                     as Char
-import qualified Data.Hex                      as Hex
 import           Data.List                      ( isPrefixOf )
 import qualified Data.Set                      as Set
 import qualified Data.Text                     as Text
-import           Data.Text.Encoding             ( encodeUtf8
-                                                , decodeUtf8
-                                                )
 import           UnliftIO.Directory             ( createDirectoryIfMissing
                                                 , doesFileExist
                                                 , removeFile
                                                 , doesDirectoryExist, copyFile
                                                 )
 import           UnliftIO.IO.File               (writeBinaryFile)
 import qualified System.Directory
-import           System.FilePath                ( FilePath
-                                                , takeBaseName
+import           System.FilePath                ( takeBaseName
                                                 , takeDirectory
                                                 , (</>)
                                                 )
@@ -214,8 +210,8 @@ decodeFileName = let
   go (hd:tl) = hd : go tl
   go [] = []
   decodeHex :: String -> String
-  decodeHex s = maybe s (Text.unpack . decodeUtf8)
-              . Hex.unhex . encodeUtf8 . Text.pack $ s
+  decodeHex s = either (const s) (Text.unpack . decodeUtf8)
+              . ByteString.decodeBase16 . encodeUtf8 . Text.pack $ s
   in \case
     "$dot$" -> "."
     "$dotdot$" -> ".."
@@ -238,7 +234,8 @@ encodeFileName = let
                  = "$x" <> encodeHex [c] <> "$" <> go rem
                | otherwise = c : go rem
   go [] = []
-  encodeHex = Text.unpack . decodeUtf8 . Hex.hex . encodeUtf8 . Text.pack
+  encodeHex :: String -> String
+  encodeHex = Text.unpack . ByteString.encodeBase16 . encodeUtf8 . Text.pack
   in \case
     "." -> "$dot$"
     ".." -> "$dotdot$"
@@ -579,7 +576,7 @@ branchHashesByPrefix codebasePath p =
       _ -> Nothing
 
 failWith :: MonadIO m => Err -> m a
-failWith = fail . show
+failWith = liftIO . fail . show
 
 -- | A version of listDirectory that returns mempty if the directory doesn't exist
 listDirectory :: MonadIO m => FilePath -> m [FilePath]

diff --git a/parser-typechecker/src/Unison/Codebase/Patch.hs b/parser-typechecker/src/Unison/Codebase/Patch.hs
@@ -19,7 +19,6 @@ import qualified Unison.Hashable               as H
 import           Unison.Reference               ( Reference )
 import qualified Unison.Util.Relation          as R
 import           Unison.Util.Relation           ( Relation )
-import           Data.Foldable                  ( toList )
 import qualified Unison.LabeledDependency      as LD
 import           Unison.LabeledDependency       ( LabeledDependency )
 

diff --git a/parser-typechecker/src/Unison/Codebase/Runtime.hs b/parser-typechecker/src/Unison/Codebase/Runtime.hs
@@ -95,7 +95,7 @@ evaluateWatches code ppe evaluationCache rt uf = do
         (bindings, results) = case out of
           TupleTerm' results -> (mempty, results)
           Term.LetRecNamed' bs (TupleTerm' results) -> (bs, results)
-          _ -> fail $ "Evaluation should produce a tuple, but gave: " ++ show out
+          _ -> error $ "Evaluation should produce a tuple, but gave: " ++ show out
       let go v eval (ref, a, uneval, isHit) =
             (a, Map.findWithDefault (die v) v watchKinds,
              ref, uneval, Term.etaNormalForm eval, isHit)

diff --git a/parser-typechecker/src/Unison/Codebase/Serialization/PutT.hs b/parser-typechecker/src/Unison/Codebase/Serialization/PutT.hs
@@ -1,6 +1,5 @@
 module Unison.Codebase.Serialization.PutT where
 
-import qualified Data.Bytes.Put                as Put
 import           Data.Bytes.Put
 import qualified Data.Serialize.Put            as Ser
 import           Data.Serialize.Put             ( PutM

diff --git a/parser-typechecker/src/Unison/Codebase/Serialization/V1.hs b/parser-typechecker/src/Unison/Codebase/Serialization/V1.hs
@@ -26,9 +26,6 @@ import           Data.Bytes.VarInt              ( VarInt(..) )
 import qualified Data.Map                      as Map
 import           Data.List                      ( elemIndex
                                                 )
-import           Data.Text.Encoding             ( encodeUtf8
-                                                , decodeUtf8
-                                                )
 import qualified Unison.Codebase.Branch         as Branch
 import qualified Unison.Codebase.Branch.Dependencies as BD
 import           Unison.Codebase.Causal         ( Raw(..)
@@ -37,7 +34,6 @@ import           Unison.Codebase.Causal         ( Raw(..)
                                                 )
 import qualified Unison.Codebase.Causal         as Causal
 import qualified Unison.Codebase.Metadata       as Metadata
-import           Unison.Codebase.NameSegment    ( NameSegment )
 import           Unison.Codebase.NameSegment    as NameSegment
 import           Unison.Codebase.Patch          ( Patch(..) )
 import qualified Unison.Codebase.Patch          as Patch

diff --git a/parser-typechecker/src/Unison/Codebase/Watch.hs b/parser-typechecker/src/Unison/Codebase/Watch.hs
@@ -21,12 +21,11 @@ import           UnliftIO.Directory             ( getModificationTime
 import           UnliftIO.MVar                  ( newEmptyMVar, takeMVar
                                                 , tryTakeMVar, tryPutMVar, putMVar )
 import           UnliftIO.STM                   ( atomically )
-import           UnliftIO.Exception             ( catch, IOException)
+import           UnliftIO.Exception             ( catch )
 import           UnliftIO.IORef                 ( newIORef
                                                 , readIORef
                                                 , writeIORef
                                                 )
-import           Data.List                      ( sortOn )
 import qualified Data.Map                      as Map
 import qualified Data.Text.IO
 import           Data.Time.Clock                ( UTCTime

diff --git a/parser-typechecker/src/Unison/Codecs.hs b/parser-typechecker/src/Unison/Codecs.hs
@@ -16,7 +16,6 @@ import qualified Data.ByteString as B
 import           Data.ByteString.Builder (doubleBE, int64BE, toLazyByteString)
 import qualified Data.ByteString.Lazy as BL
 import           Data.Bytes.Put
-import           Data.Text.Encoding (encodeUtf8)
 import qualified Unison.ABT as ABT
 import qualified Unison.Blank as Blank
 import qualified Unison.DataDeclaration as DD

diff --git a/parser-typechecker/src/Unison/CommandLine/InputPatterns.hs b/parser-typechecker/src/Unison/CommandLine/InputPatterns.hs
@@ -11,7 +11,7 @@ import Unison.Prelude
 import qualified Control.Lens.Cons as Cons
 import qualified Control.Lens as Lens
 import Data.Bifunctor (first)
-import Data.List (intercalate, sortOn, isPrefixOf)
+import Data.List (intercalate, isPrefixOf)
 import Data.List.Extra (nubOrdOn)
 import qualified System.Console.Haskeline.Completion as Completion
 import System.Console.Haskeline.Completion (Completion(Completion))

diff --git a/parser-typechecker/src/Unison/CommandLine/OutputMessages.hs b/parser-typechecker/src/Unison/CommandLine/OutputMessages.hs
@@ -23,8 +23,8 @@ import qualified Unison.Codebase.Editor.Output.BranchDiff as OBD
 
 import           Control.Lens
 import qualified Control.Monad.State.Strict    as State
-import           Data.Bifunctor                (bimap, first, second)
-import           Data.List                     (sort, sortOn, stripPrefix)
+import           Data.Bifunctor                (first, second)
+import           Data.List                     (sort, stripPrefix)
 import           Data.List.Extra               (nubOrdOn, nubOrd, notNull)
 import qualified Data.Map                      as Map
 import qualified Data.Set                      as Set
@@ -108,7 +108,6 @@ import qualified Unison.Util.List              as List
 import qualified Unison.Util.Monoid            as Monoid
 import Data.Tuple (swap)
 import Unison.Codebase.ShortBranchHash (ShortBranchHash)
-import Control.Lens (view, over, _1, _3)
 import qualified Unison.ShortHash as SH
 import Unison.LabeledDependency as LD
 import Unison.Codebase.Editor.RemoteRepo (RemoteRepo)

diff --git a/parser-typechecker/src/Unison/Parser.hs b/parser-typechecker/src/Unison/Parser.hs
@@ -17,7 +17,6 @@ import           Data.List.NonEmpty   (NonEmpty (..))
 -- import           Data.Maybe
 import qualified Data.Set             as Set
 import qualified Data.Text            as Text
-import           Data.Text.Encoding   (encodeUtf8)
 import           Data.Typeable        (Proxy (..))
 import           Text.Megaparsec      (runParserT)
 import qualified Text.Megaparsec      as P

diff --git a/parser-typechecker/src/Unison/Runtime/IR.hs b/parser-typechecker/src/Unison/Runtime/IR.hs
@@ -14,7 +14,7 @@ module Unison.Runtime.IR where
 
 import Unison.Prelude
 
-import Control.Monad.State.Strict (StateT, gets, modify, runStateT, lift)
+import Control.Monad.State.Strict (StateT, gets, modify, runStateT)
 import Data.Bifunctor (first, second)
 import Data.IORef
 import Unison.Hash (Hash)

diff --git a/parser-typechecker/src/Unison/Runtime/Rt1IO.hs b/parser-typechecker/src/Unison/Runtime/Rt1IO.hs
@@ -9,8 +9,7 @@ module Unison.Runtime.Rt1IO where
 
 import Unison.Prelude
 
-import           Control.Exception              ( try
-                                                , throwIO
+import           Control.Exception              ( throwIO
                                                 , AsyncException(UserInterrupt)
                                                 , finally
                                                 , bracket

diff --git a/parser-typechecker/src/Unison/Typechecker/Components.hs b/parser-typechecker/src/Unison/Typechecker/Components.hs
@@ -5,7 +5,7 @@ import Unison.Prelude
 import           Control.Arrow ((&&&))
 import           Data.Bifunctor (first)
 import           Data.Function (on)
-import           Data.List (groupBy, sortBy, sortOn)
+import           Data.List (groupBy, sortBy)
 import           Data.List.NonEmpty (NonEmpty)
 import qualified Data.List.NonEmpty as Nel
 import qualified Data.Map as Map

diff --git a/parser-typechecker/src/Unison/Typechecker/Extractor.hs b/parser-typechecker/src/Unison/Typechecker/Extractor.hs
@@ -5,7 +5,6 @@ module Unison.Typechecker.Extractor where
 
 import Unison.Prelude hiding (whenM)
 
-import           Control.Monad.Fail             ( MonadFail, fail )
 import           Control.Monad.Reader
 import qualified Data.List                     as List
 import           Data.List.NonEmpty            ( NonEmpty )
@@ -316,7 +315,6 @@ instance MonadFail (SubseqExtractor' n) where
   fail _ = mzero
 
 instance Monad (SubseqExtractor' n) where
-  fail = Control.Monad.Fail.fail
   return a = SubseqExtractor' $ \_ -> [Pure a]
   xa >>= f = SubseqExtractor' $ \note ->
     let as = runSubseq xa note in do

diff --git a/parser-typechecker/src/Unison/UnisonFile.hs b/parser-typechecker/src/Unison/UnisonFile.hs
@@ -16,7 +16,7 @@ import qualified Unison.ABT as ABT
 import qualified Unison.ConstructorType as CT
 import           Unison.DataDeclaration (DataDeclaration')
 import           Unison.DataDeclaration (EffectDeclaration' (..))
-import           Unison.DataDeclaration (hashDecls, toDataDecl)
+import           Unison.DataDeclaration (hashDecls)
 import qualified Unison.DataDeclaration as DD
 import qualified Unison.Builtin.Decls   as DD
 import qualified Unison.Name            as Name

diff --git a/parser-typechecker/src/Unison/Util/Cache.hs b/parser-typechecker/src/Unison/Util/Cache.hs
@@ -4,7 +4,7 @@ module Unison.Util.Cache where
 
 import Prelude hiding (lookup)
 import Unison.Prelude
-import UnliftIO (MonadIO, newTVarIO, modifyTVar', writeTVar, atomically, readTVar, readTVarIO)
+import UnliftIO (newTVarIO, modifyTVar', writeTVar, atomically, readTVar, readTVarIO)
 import qualified Data.Map as Map
 
 data Cache m k v =

diff --git a/parser-typechecker/src/Unison/Util/Logger.hs b/parser-typechecker/src/Unison/Util/Logger.hs
@@ -16,7 +16,7 @@ import Unison.Prelude
 
 import Control.Concurrent (forkIO)
 import Control.Concurrent.MVar
-import Control.Exception (bracket, try)
+import Control.Exception (bracket)
 import Data.List
 import System.IO (Handle, hPutStrLn, hGetLine, stdout, stderr)
 import System.IO.Error (isEOFError)

diff --git a/parser-typechecker/src/Unison/Util/Pretty.hs b/parser-typechecker/src/Unison/Util/Pretty.hs
@@ -112,7 +112,7 @@ import Unison.Prelude
 
 import           Data.Bifunctor                 ( second )
 import           Data.Char                      ( isSpace )
-import           Data.List                      ( foldr1, intersperse )
+import           Data.List                      ( intersperse )
 import           Prelude                 hiding ( lines , map )
 import           Unison.Util.AnnotatedText      ( annotateMaybe )
 import qualified Unison.Util.ColorText         as CT

diff --git a/parser-typechecker/unison-parser-typechecker.cabal b/parser-typechecker/unison-parser-typechecker.cabal
@@ -147,6 +147,7 @@ library
     ansi-terminal,
     async,
     base,
+    base16 >= 0.2.1.0,
     bifunctors,
     bytes,
     bytestring,
@@ -168,12 +169,10 @@ library
     fingertree,
     free,
     fsnotify,
-    fsutils,
     generic-monoid,
     hashable,
     hashtables,
     haskeline,
-    hex,
     io-streams,
     lens,
     ListLike,
@@ -234,6 +233,7 @@ executable unison
   hs-source-dirs: unison
   ghc-options: -Wall -fno-warn-name-shadowing -fno-warn-missing-pattern-synonym-signatures
   other-modules:
+    System.Path
     Version
   build-depends:
     base,
@@ -242,7 +242,6 @@ executable unison
     directory,
     errors,
     filepath,
-    fsutils,
     megaparsec,
     safe,
     shellmet,