Skip to content
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

Upgrade hlint #2235

Merged
1 commit merged into from
Jul 22, 2019
Merged

Upgrade hlint #2235

1 commit merged into from
Jul 22, 2019

Conversation

ghost
Copy link

@ghost ghost commented Jul 21, 2019

This PR brings DAML level with hlint head. It pulls in naming and import rules. There is one slight problem : as the GHC and DAML parse trees are divergent, hlint upstream is incompatible in Naming.hs with the DAML version of ghc-lib. This requires patching hlint (the Match constructor has 5 arguments rather than 4 in our version to account for optional function return type signatures). I've done this on the da-master branch of my fork and updated WORKSPACE to fetch hlint from there for the time being.

@ghost ghost requested a review from cocreature July 21, 2019 20:55
Copy link
Contributor

@cocreature cocreature left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM but we probably want to switch to having the fork under digital-asset in the near future.

@@ -526,7 +526,7 @@ hazel_repositories(
# - To build the library : `bazel build @haskell_hlint//:lib`
# We'll be using it via the library, not the binary.
hazel_hackage("haskell-src-exts", "1.21.0", "95dac187824edfa23b6a2363880b5e113df8ce4a641e8a0f76e6d45aaa699ff3") +
hazel_github_external("ndmitchell", "hlint", "9589299bf9a6273fe7c2915da3f9b7c35f82d527", "49386869b32cf1ccf8241ce9fe927d14475bd693e769ad65670715d3401a959f") +
hazel_github_external("shayne-fletcher-da", "hlint", "699adc7c7be5f876433a49661311093c42259cf1", "1fe563fa724ce589b85d67349d98ce254e01cfe28bda8bcf46958d944987e2cb") +
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we have a fork under digital-asset?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, we should.

Copy link
Contributor

@hurryabit hurryabit left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks.

@@ -526,7 +526,7 @@ hazel_repositories(
# - To build the library : `bazel build @haskell_hlint//:lib`
# We'll be using it via the library, not the binary.
hazel_hackage("haskell-src-exts", "1.21.0", "95dac187824edfa23b6a2363880b5e113df8ce4a641e8a0f76e6d45aaa699ff3") +
hazel_github_external("ndmitchell", "hlint", "9589299bf9a6273fe7c2915da3f9b7c35f82d527", "49386869b32cf1ccf8241ce9fe927d14475bd693e769ad65670715d3401a959f") +
hazel_github_external("shayne-fletcher-da", "hlint", "699adc7c7be5f876433a49661311093c42259cf1", "1fe563fa724ce589b85d67349d98ce254e01cfe28bda8bcf46958d944987e2cb") +
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, we should.

@ghost
Copy link
Author

ghost commented Jul 22, 2019

Great! I'll take it with @garyverhaegen-da and get it set up.

@ghost ghost merged commit 743ac83 into master Jul 22, 2019
@ghost ghost deleted the upgrade-hlint branch July 22, 2019 09:49
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants