[create-pull-request] automated change

This commit is contained in:
aryairani 2024-03-12 18:35:54 +00:00 committed by github-actions[bot]
parent 70b937bc76
commit f88d652383
14 changed files with 62 additions and 55 deletions

View File

@ -8,11 +8,11 @@ import Unison.Codebase.Path (Path)
import Unison.Codebase.Path qualified as Path import Unison.Codebase.Path qualified as Path
import Unison.Codebase.ShortCausalHash (ShortCausalHash) import Unison.Codebase.ShortCausalHash (ShortCausalHash)
import Unison.Codebase.ShortCausalHash qualified as SCH import Unison.Codebase.ShortCausalHash qualified as SCH
import Unison.NameSegment qualified as NameSegment
import Unison.Prelude import Unison.Prelude
import Unison.Project (ProjectAndBranch (..), ProjectBranchName, ProjectName) import Unison.Project (ProjectAndBranch (..), ProjectBranchName, ProjectName)
import Unison.Share.Types import Unison.Share.Types
import Unison.Util.Monoid qualified as Monoid import Unison.Util.Monoid qualified as Monoid
import qualified Unison.NameSegment as NameSegment
data ReadRepo data ReadRepo
= ReadRepoGit ReadGitRepo = ReadRepoGit ReadGitRepo

View File

@ -35,7 +35,7 @@ import Control.Monad.Catch (MonadCatch)
import Control.Monad.Primitive qualified as PA import Control.Monad.Primitive qualified as PA
import Control.Monad.Reader (ReaderT (..), ask, runReaderT) import Control.Monad.Reader (ReaderT (..), ask, runReaderT)
import Control.Monad.State.Strict (State, execState, modify) import Control.Monad.State.Strict (State, execState, modify)
import Crypto.Error (CryptoError(..), CryptoFailable(..)) import Crypto.Error (CryptoError (..), CryptoFailable (..))
import Crypto.Hash qualified as Hash import Crypto.Hash qualified as Hash
import Crypto.MAC.HMAC qualified as HMAC import Crypto.MAC.HMAC qualified as HMAC
import Crypto.PubKey.Ed25519 qualified as Ed25519 import Crypto.PubKey.Ed25519 qualified as Ed25519
@ -2823,10 +2823,12 @@ declareForeigns = do
in pure . Bytes.fromArray . hmac alg $ serializeValueLazy x in pure . Bytes.fromArray . hmac alg $ serializeValueLazy x
declareForeign Untracked "crypto.Ed25519.sign.impl" boxBoxBoxToEFBox declareForeign Untracked "crypto.Ed25519.sign.impl" boxBoxBoxToEFBox
. mkForeign $ pure . signEd25519Wrapper . mkForeign
$ pure . signEd25519Wrapper
declareForeign Untracked "crypto.Ed25519.verify.impl" boxBoxBoxToEFBool declareForeign Untracked "crypto.Ed25519.verify.impl" boxBoxBoxToEFBool
. mkForeign $ pure . verifyEd25519Wrapper . mkForeign
$ pure . verifyEd25519Wrapper
let catchAll :: (MonadCatch m, MonadIO m, NFData a) => m a -> m (Either Util.Text.Text a) let catchAll :: (MonadCatch m, MonadIO m, NFData a) => m a -> m (Either Util.Text.Text a)
catchAll e = do catchAll e = do
@ -3426,15 +3428,16 @@ hostPreference (Just host) = SYS.Host $ Util.Text.unpack host
signEd25519Wrapper :: signEd25519Wrapper ::
(Bytes.Bytes, Bytes.Bytes, Bytes.Bytes) -> Either Failure Bytes.Bytes (Bytes.Bytes, Bytes.Bytes, Bytes.Bytes) -> Either Failure Bytes.Bytes
signEd25519Wrapper (secret0, public0, msg0) = case validated of signEd25519Wrapper (secret0, public0, msg0) = case validated of
CryptoFailed err -> CryptoFailed err ->
Left (Failure Ty.cryptoFailureRef (errMsg err) unitValue) Left (Failure Ty.cryptoFailureRef (errMsg err) unitValue)
CryptoPassed (secret, public) -> CryptoPassed (secret, public) ->
Right . Bytes.fromArray $ Ed25519.sign secret public msg Right . Bytes.fromArray $ Ed25519.sign secret public msg
where where
msg = Bytes.toArray msg0 :: ByteString msg = Bytes.toArray msg0 :: ByteString
validated = validated =
(,) <$> Ed25519.secretKey (Bytes.toArray secret0 :: ByteString) (,)
<*> Ed25519.publicKey (Bytes.toArray public0 :: ByteString) <$> Ed25519.secretKey (Bytes.toArray secret0 :: ByteString)
<*> Ed25519.publicKey (Bytes.toArray public0 :: ByteString)
errMsg CryptoError_PublicKeySizeInvalid = errMsg CryptoError_PublicKeySizeInvalid =
"ed25519: Public key size invalid" "ed25519: Public key size invalid"
@ -3447,15 +3450,16 @@ signEd25519Wrapper (secret0, public0, msg0) = case validated of
verifyEd25519Wrapper :: verifyEd25519Wrapper ::
(Bytes.Bytes, Bytes.Bytes, Bytes.Bytes) -> Either Failure Bool (Bytes.Bytes, Bytes.Bytes, Bytes.Bytes) -> Either Failure Bool
verifyEd25519Wrapper (public0, msg0, sig0) = case validated of verifyEd25519Wrapper (public0, msg0, sig0) = case validated of
CryptoFailed err -> CryptoFailed err ->
Left $ Failure Ty.cryptoFailureRef (errMsg err) unitValue Left $ Failure Ty.cryptoFailureRef (errMsg err) unitValue
CryptoPassed (public, sig) -> CryptoPassed (public, sig) ->
Right $ Ed25519.verify public msg sig Right $ Ed25519.verify public msg sig
where where
msg = Bytes.toArray msg0 :: ByteString msg = Bytes.toArray msg0 :: ByteString
validated = validated =
(,) <$> Ed25519.publicKey (Bytes.toArray public0 :: ByteString) (,)
<*> Ed25519.signature (Bytes.toArray sig0 :: ByteString) <$> Ed25519.publicKey (Bytes.toArray public0 :: ByteString)
<*> Ed25519.signature (Bytes.toArray sig0 :: ByteString)
errMsg CryptoError_PublicKeySizeInvalid = errMsg CryptoError_PublicKeySizeInvalid =
"ed25519: Public key size invalid" "ed25519: Public key size invalid"

View File

@ -1,6 +1,7 @@
module Unison.Syntax.FileParser module Unison.Syntax.FileParser
( file ( file,
) where )
where
import Control.Lens import Control.Lens
import Control.Monad.Reader (asks, local) import Control.Monad.Reader (asks, local)

View File

@ -1,10 +1,11 @@
{-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE OverloadedStrings #-}
module Unison.Syntax.TypeParser module Unison.Syntax.TypeParser
( computationType ( computationType,
, valueType valueType,
, valueTypeLeaf valueTypeLeaf,
) where )
where
import Control.Monad.Reader (asks) import Control.Monad.Reader (asks)
import Data.Set qualified as Set import Data.Set qualified as Set

View File

@ -61,14 +61,15 @@ import Unison.Sqlite qualified as Sqlite
import Witch (unsafeFrom) import Witch (unsafeFrom)
branchRelativePathToAbsolute :: BranchRelativePath -> Cli Path.Absolute branchRelativePathToAbsolute :: BranchRelativePath -> Cli Path.Absolute
branchRelativePathToAbsolute brp = resolveBranchRelativePath brp <&> \case branchRelativePathToAbsolute brp =
BranchRelativePath.ResolvedLoosePath p -> p resolveBranchRelativePath brp <&> \case
BranchRelativePath.ResolvedBranchRelative projectBranch mRel -> BranchRelativePath.ResolvedLoosePath p -> p
let projectBranchIds = getIds projectBranch BranchRelativePath.ResolvedBranchRelative projectBranch mRel ->
handleRel = case mRel of let projectBranchIds = getIds projectBranch
Nothing -> id handleRel = case mRel of
Just rel -> flip Path.resolve rel Nothing -> id
in handleRel (projectBranchPath projectBranchIds) Just rel -> flip Path.resolve rel
in handleRel (projectBranchPath projectBranchIds)
where where
getIds = \case getIds = \case
ProjectAndBranch project branch -> ProjectAndBranch (view #projectId project) (view #branchId branch) ProjectAndBranch project branch -> ProjectAndBranch (view #projectId project) (view #branchId branch)
@ -91,7 +92,6 @@ resolveBranchRelativePath = \case
toThese = \case toThese = \case
Left branchName -> That branchName Left branchName -> That branchName
Right (projectName, branchName) -> These projectName branchName Right (projectName, branchName) -> These projectName branchName
-- | Get the current project that a user is on. -- | Get the current project that a user is on.
getCurrentProject :: Cli (Maybe Sqlite.Project) getCurrentProject :: Cli (Maybe Sqlite.Project)

View File

@ -2757,7 +2757,7 @@ renderEditConflicts ppe Patch {..} = do
then "deprecated and also replaced with" then "deprecated and also replaced with"
else "replaced with" else "replaced with"
) )
`P.hang` P.lines replacements `P.hang` P.lines replacements
formatTermEdits :: formatTermEdits ::
(Reference.TermReference, Set TermEdit.TermEdit) -> (Reference.TermReference, Set TermEdit.TermEdit) ->
Numbered Pretty Numbered Pretty
@ -2772,7 +2772,7 @@ renderEditConflicts ppe Patch {..} = do
then "deprecated and also replaced with" then "deprecated and also replaced with"
else "replaced with" else "replaced with"
) )
`P.hang` P.lines replacements `P.hang` P.lines replacements
formatConflict :: formatConflict ::
Either Either
(Reference, Set TypeEdit.TypeEdit) (Reference, Set TypeEdit.TypeEdit)

View File

@ -43,7 +43,7 @@ import Unison.Referent qualified as Referent
import Unison.Runtime.IOSource qualified as IOSource import Unison.Runtime.IOSource qualified as IOSource
import Unison.Syntax.DeclPrinter qualified as DeclPrinter import Unison.Syntax.DeclPrinter qualified as DeclPrinter
import Unison.Syntax.HashQualified' qualified as HQ' (toText) import Unison.Syntax.HashQualified' qualified as HQ' (toText)
import Unison.Syntax.Name qualified as Name (parseText, nameP, toText) import Unison.Syntax.Name qualified as Name (nameP, parseText, toText)
import Unison.Syntax.TypePrinter qualified as TypePrinter import Unison.Syntax.TypePrinter qualified as TypePrinter
import Unison.Util.Monoid qualified as Monoid import Unison.Util.Monoid qualified as Monoid
import Unison.Util.Pretty qualified as Pretty import Unison.Util.Pretty qualified as Pretty

View File

@ -1,4 +1,5 @@
{-# LANGUAGE OverloadedStrings, RecordWildCards #-} {-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE RecordWildCards #-}
{- This module kicks off the Transcript Tests. {- This module kicks off the Transcript Tests.
It doesn't do the transcript parsing itself. It doesn't do the transcript parsing itself.
@ -16,8 +17,8 @@ import System.FilePath
splitFileName, splitFileName,
takeDirectory, takeDirectory,
takeExtensions, takeExtensions,
(</>),
(<.>), (<.>),
(</>),
) )
import System.IO.CodePage (withCP65001) import System.IO.CodePage (withCP65001)
import System.IO.Silently (silence) import System.IO.Silently (silence)
@ -82,7 +83,7 @@ outputFileForTranscript filePath =
replaceExtension filePath ".output.md" replaceExtension filePath ".output.md"
buildTests :: TestConfig -> TestBuilder -> FilePath -> Test () buildTests :: TestConfig -> TestBuilder -> FilePath -> Test ()
buildTests TestConfig{ .. } testBuilder dir = do buildTests TestConfig {..} testBuilder dir = do
io io
. putStrLn . putStrLn
. unlines . unlines
@ -149,9 +150,9 @@ test config = do
cleanup cleanup
handleArgs :: TestConfig -> [String] -> TestConfig handleArgs :: TestConfig -> [String] -> TestConfig
handleArgs acc ("--runtime-path":p:rest) = handleArgs acc ("--runtime-path" : p : rest) =
handleArgs (acc { runtimePath = p }) rest handleArgs (acc {runtimePath = p}) rest
handleArgs acc [prefix] = acc { matchPrefix = Just prefix } handleArgs acc [prefix] = acc {matchPrefix = Just prefix}
handleArgs acc _ = acc handleArgs acc _ = acc
defaultConfig :: IO TestConfig defaultConfig :: IO TestConfig

View File

@ -42,9 +42,9 @@ import Network.HTTP.Client.TLS qualified as HTTP
import Stats (recordRtsStats) import Stats (recordRtsStats)
import System.Directory import System.Directory
( canonicalizePath, ( canonicalizePath,
exeExtension,
getCurrentDirectory, getCurrentDirectory,
removeDirectoryRecursive, removeDirectoryRecursive,
exeExtension
) )
import System.Environment (getExecutablePath, getProgName, withArgs) import System.Environment (getExecutablePath, getProgName, withArgs)
import System.Exit qualified as Exit import System.Exit qualified as Exit
@ -52,8 +52,8 @@ import System.FilePath
( replaceExtension, ( replaceExtension,
takeDirectory, takeDirectory,
takeExtension, takeExtension,
(</>),
(<.>), (<.>),
(</>),
) )
import System.IO (stderr) import System.IO (stderr)
import System.IO.CodePage (withCP65001) import System.IO.CodePage (withCP65001)

View File

@ -5,4 +5,3 @@ module Unison.Kind where
import Unison.Prelude import Unison.Prelude
data Kind = Star | Arrow Kind Kind deriving (Eq, Ord, Read, Show, Generic) data Kind = Star | Arrow Kind Kind deriving (Eq, Ord, Read, Show, Generic)

View File

@ -6,7 +6,7 @@ import Unison.Name qualified as Name
import Unison.Name.Internal (Name) import Unison.Name.Internal (Name)
import Unison.NameSegment (NameSegment) import Unison.NameSegment (NameSegment)
newtype ForwardName = ForwardName { toList :: NonEmpty NameSegment } deriving (Eq, Ord, Show) newtype ForwardName = ForwardName {toList :: NonEmpty NameSegment} deriving (Eq, Ord, Show)
-- | O(d) -- | O(d)
fromName :: Name -> ForwardName fromName :: Name -> ForwardName

View File

@ -42,8 +42,8 @@ import Unison.Server.Types
mayDefaultWidth, mayDefaultWidth,
) )
import Unison.Symbol (Symbol) import Unison.Symbol (Symbol)
import Unison.Syntax.Name qualified as Name
import Unison.Util.Pretty (Width) import Unison.Util.Pretty (Width)
import qualified Unison.Syntax.Name as Name
type FuzzyFindAPI = type FuzzyFindAPI =
"find" "find"

View File

@ -1,11 +1,12 @@
module Unison.Server.NameSearch module Unison.Server.NameSearch
( Search(..) ( Search (..),
, NameSearch(..) NameSearch (..),
, hoistSearch hoistSearch,
, hoistNameSearch hoistNameSearch,
, applySearch applySearch,
, SearchType(..) SearchType (..),
) where )
where
import Control.Lens import Control.Lens
import Data.List qualified as List import Data.List qualified as List
@ -13,7 +14,7 @@ import Data.Set qualified as Set
import Unison.HashQualified qualified as HQ import Unison.HashQualified qualified as HQ
import Unison.HashQualified' qualified as HQ' import Unison.HashQualified' qualified as HQ'
import Unison.Name (Name) import Unison.Name (Name)
import Unison.NamesWithHistory (SearchType(..)) import Unison.NamesWithHistory (SearchType (..))
import Unison.Prelude import Unison.Prelude
import Unison.Reference (Reference) import Unison.Reference (Reference)
import Unison.Referent (Referent) import Unison.Referent (Referent)

View File

@ -747,9 +747,9 @@ instance FromJSON HashMismatchForEntity where
Aeson.withObject "HashMismatchForEntity" \obj -> Aeson.withObject "HashMismatchForEntity" \obj ->
HashMismatchForEntity HashMismatchForEntity
<$> obj <$> obj
.: "supplied" .: "supplied"
<*> obj <*> obj
.: "computed" .: "computed"
------------------------------------------------------------------------------------------------------------------------ ------------------------------------------------------------------------------------------------------------------------
-- Fast-forward path -- Fast-forward path