validate-whitespace

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|

validate-whitespace

Alejandro Serrano Mena
Hi GHC devs,
I have made a rebase to bring my merge request [https://gitlab.haskell.org/ghc/ghc/merge_requests/1659] up to date with the current GHC codebase. In the process there were some conflicts (as expected) which I could solve. However, now that I have pushed the result, I get these messages from the CI infrastructure:

$ validate-whitespace .git $(git rev-list $base..$CI_COMMIT_SHA)
=====================================================================================
commit 0d92f8c898ccbf2ffb602bc75e50e9ffd44811d8 has whitespace linter issues:

 *ERROR* compiler/typecheck/TcUnify.hs:810: introduces trailing whitespace
 > "          "

 *ERROR* compiler/typecheck/TcUnify.hs:818: introduces trailing whitespace
 > "      = "

Validation FAILED for 0d92f8c898ccbf2ffb602bc75e50e9ffd44811d8
=====================================================================================
commit 465d27f2119d7bdbe06832dd79c3848e27b4aaef has whitespace linter issues:

 *ERROR* compiler/typecheck/TcExpr.hs:1315: introduces trailing whitespace
 > "           ; subst <- if xopt LangExt.ImpredicativeTypes dflags "

 *ERROR* compiler/typecheck/TcExpr.hs:1472: introduces trailing whitespace
 > "              _ -> return emptyTCvSubst "

 *ERROR* compiler/typecheck/TcExpr.hs:1513: introduces trailing whitespace
 > "    "

Validation FAILED for 465d27f2119d7bdbe06832dd79c3848e27b4aaef
=====================================================================================
Validation FAILED because at least one commit had linter errors!

What is the right approach to fix these problems? I can fix the whitespace issues in a new commit, but I don't see how to fix them in all the interim commits :(

Thanks in advance and kind regards,
Alejandro

_______________________________________________
ghc-devs mailing list
[hidden email]
http://mail.haskell.org/cgi-bin/mailman/listinfo/ghc-devs
Reply | Threaded
Open this post in threaded view
|

Re: validate-whitespace

Matthew Pickering
You should rebase + squash your patch.

Or, if you just want to look at CI, turn off the linters for now.

Matt

On Wed, Sep 18, 2019 at 8:54 AM Alejandro Serrano Mena
<[hidden email]> wrote:

>
> Hi GHC devs,
> I have made a rebase to bring my merge request [https://gitlab.haskell.org/ghc/ghc/merge_requests/1659] up to date with the current GHC codebase. In the process there were some conflicts (as expected) which I could solve. However, now that I have pushed the result, I get these messages from the CI infrastructure:
>
> $ validate-whitespace .git $(git rev-list $base..$CI_COMMIT_SHA)
> =====================================================================================
> commit 0d92f8c898ccbf2ffb602bc75e50e9ffd44811d8 has whitespace linter issues:
>
>  *ERROR* compiler/typecheck/TcUnify.hs:810: introduces trailing whitespace
>  > "          "
>
>  *ERROR* compiler/typecheck/TcUnify.hs:818: introduces trailing whitespace
>  > "      = "
>
> Validation FAILED for 0d92f8c898ccbf2ffb602bc75e50e9ffd44811d8
> =====================================================================================
> commit 465d27f2119d7bdbe06832dd79c3848e27b4aaef has whitespace linter issues:
>
>  *ERROR* compiler/typecheck/TcExpr.hs:1315: introduces trailing whitespace
>  > "           ; subst <- if xopt LangExt.ImpredicativeTypes dflags "
>
>  *ERROR* compiler/typecheck/TcExpr.hs:1472: introduces trailing whitespace
>  > "              _ -> return emptyTCvSubst "
>
>  *ERROR* compiler/typecheck/TcExpr.hs:1513: introduces trailing whitespace
>  > "    "
>
> Validation FAILED for 465d27f2119d7bdbe06832dd79c3848e27b4aaef
> =====================================================================================
> Validation FAILED because at least one commit had linter errors!
>
> What is the right approach to fix these problems? I can fix the whitespace issues in a new commit, but I don't see how to fix them in all the interim commits :(
>
> Thanks in advance and kind regards,
> Alejandro
> _______________________________________________
> ghc-devs mailing list
> [hidden email]
> http://mail.haskell.org/cgi-bin/mailman/listinfo/ghc-devs
_______________________________________________
ghc-devs mailing list
[hidden email]
http://mail.haskell.org/cgi-bin/mailman/listinfo/ghc-devs