-
Notifications
You must be signed in to change notification settings - Fork 269
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[DO NOT MERGE] GHC 964 cabal compilation #5096
Changes from all commits
d745d24
e51ceab
9d8db9b
8a6c7d2
cfda33f
4338758
efcbfa3
57a86d2
8ef3243
33be385
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -53,7 +53,6 @@ library | |
TupleSections | ||
TypeApplications | ||
ViewPatterns | ||
ghc-options: -Wall | ||
build-depends: | ||
base | ||
, bytes | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -17,7 +17,7 @@ type TypeEdit = TypeEdit' Db.TextId Db.ObjectId | |
type HashTypeEdit = TypeEdit' Text ComponentHash | ||
|
||
data TypeEdit' t h = Replace (Reference' t h) | Deprecate | ||
deriving (Eq, Ord, Show) | ||
deriving (Eq, Functor, Ord, Show) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Why add There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Yup, if I don't add it then it errors out with:
|
||
|
||
_Replace :: Prism (TypeEdit' t h) (TypeEdit' t' h') (Reference' t h) (Reference' t' h') | ||
_Replace = prism Replace project | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -61,7 +61,7 @@ flattenEffects es = [es] | |
generalize :: (Ord v) => [v] -> TypeR r v -> TypeR r v | ||
generalize vs t = foldr f t vs | ||
where | ||
f v t = if Set.member v (ABT.freeVars t) then forall v t else t | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Just a warning, not strictly necessary:
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Sorry, I couldn't see on the Conversation page that you'd already renamed it. |
||
f v t = if Set.member v (ABT.freeVars t) then forAll v t else t | ||
|
||
-- * Patterns | ||
|
||
|
@@ -80,8 +80,8 @@ pattern Effect1' e t <- ABT.Tm' (Effect e t) | |
pattern Ref' :: r -> TypeR r v | ||
pattern Ref' r <- ABT.Tm' (Ref r) | ||
|
||
forall :: (Ord v) => v -> TypeR r v -> TypeR r v | ||
forall v body = ABT.tm () (Forall (ABT.abs () v body)) | ||
forAll :: (Ord v) => v -> TypeR r v -> TypeR r v | ||
forAll v body = ABT.tm () (Forall (ABT.abs () v body)) | ||
|
||
unforall' :: TypeR r v -> ([v], TypeR r v) | ||
unforall' (ForallsNamed' vs t) = (vs, t) | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,5 @@ | ||
packages: | ||
../fuzzyfind | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. local copy of fuzzyfind as we haven't built the new packages following the update yet |
||
codebase2/codebase | ||
codebase2/codebase-sqlite | ||
codebase2/codebase-sqlite-hashing-v2 | ||
|
@@ -29,6 +30,8 @@ packages: | |
parser-typechecker | ||
unison-core | ||
unison-cli | ||
unison-cli-main | ||
unison-merge | ||
unison-hashing-v2 | ||
unison-share-api | ||
unison-share-projects-api | ||
|
@@ -48,7 +51,7 @@ source-repository-package | |
constraints: | ||
fsnotify < 0.4, | ||
crypton-x509-store <= 1.6.8, | ||
servant <= 0.19.1, | ||
servant <= 0.20.1, | ||
optparse-applicative <= 0.17.1.0 | ||
|
||
-- For now there is no way to apply ghc-options for all local packages | ||
|
@@ -119,6 +122,9 @@ package unison-util-rope | |
package parser-typechecker | ||
ghc-options: -Wall -Werror -Wno-name-shadowing -Wno-type-defaults -Wno-missing-pattern-synonym-signatures -fprint-expanded-synonyms -fwrite-ide-info | ||
|
||
package unison-merge | ||
ghc-options: -Wall -Werror -Wno-name-shadowing -Wno-type-defaults -Wno-missing-pattern-synonym-signatures -fprint-expanded-synonyms -fwrite-ide-info | ||
|
||
package unison-cli | ||
ghc-options: -Wall -Werror -Wno-name-shadowing -Wno-type-defaults -Wno-missing-pattern-synonym-signatures -fprint-expanded-synonyms -fwrite-ide-info | ||
|
||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,6 @@ | ||
{-# LANGUAGE FunctionalDependencies #-} | ||
{-# LANGUAGE UndecidableInstances #-} | ||
{-# LANGUAGE TypeOperators #-} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
|
||
|
||
-- | Tuple utils. | ||
module Unison.Util.Tuple | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -172,9 +172,9 @@ execute conn@(Connection _ _ conn0) sql@(Sql s params) = do | |
-- | ||
-- This function does not support parameters, and is mostly useful for executing DDL and migrations. | ||
executeStatements :: Connection -> Text -> IO () | ||
executeStatements conn@(Connection _ _ (Sqlite.Connection database)) sql = do | ||
executeStatements conn@(Connection _ _ connection) sql = do | ||
logQuery (Sql sql []) Nothing | ||
Direct.Sqlite.exec database sql `catch` \(exception :: Sqlite.SQLError) -> | ||
Direct.Sqlite.exec (Sqlite.connectionHandle connection) sql `catch` \(exception :: Sqlite.SQLError) -> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
https://hackage.haskell.org/package/sqlite-simple-0.4.18.2/docs/src/Database.SQLite.Simple.Internal.html#connectionHandle |
||
throwSqliteQueryException | ||
SqliteQueryExceptionInfo | ||
{ connection = conn, | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -44,7 +44,6 @@ library | |
TupleSections | ||
TypeApplications | ||
ViewPatterns | ||
ghc-options: -Wall | ||
build-depends: | ||
base | ||
, base32 | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
interestingly the default deriving doesn't work:
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not sure, but I'd guess the defaultFunctor
can only figure out one type variable?I dunno.