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

Add make style-todo and fourmolu on off comments #10683

Merged
merged 11 commits into from
Jan 18, 2025

Conversation

philderbeast
Copy link
Collaborator

Addresses the parser errors of fourmolu so that #10491 can proceed without having to add {- FOURMOLU_DISABLE -} comments.

$ make style-todo
Cabal-described/src/Distribution/Utils/CharSet.hs:116:1-6
  The GHC parser (in Haddock mode) failed:
  [GHC-58481] parse error on input `insert'
Cabal-tests/tests/HackageTests.hs:304:5-9
  The GHC parser (in Haddock mode) failed:
  [GHC-58481] parse error on input `parse'
Cabal-tests/tests/ParserTests.hs:205:1
  The GHC parser (in Haddock mode) failed:
  [GHC-58481] parse error (possibly incorrect indentation or mismatched brackets)
Cabal-tests/tests/custom-setup/CabalDoctestSetup.hs:287:1
  The GHC parser (in Haddock mode) failed:
  [GHC-58481] parse error (possibly incorrect indentation or mismatched brackets)
Cabal-tests/tests/custom-setup/IdrisSetup.hs:95:1-5
  The GHC parser (in Haddock mode) failed:
  [GHC-58481] parse error on input `where'
cabal-install-solver/src/Distribution/Solver/Modular/Solver.hs:175:1
  The GHC parser (in Haddock mode) failed:
  [GHC-58481] parse error (possibly incorrect indentation or mismatched brackets)
cabal-testsuite/src/Test/Cabal/Server.hs:267:34-35
  The GHC parser (in Haddock mode) failed:
  [GHC-58481] parse error on input `->'
make: *** [Makefile:55: style-todo] Error 102

  • Patches conform to the coding conventions.
  • Is this a PR that fixes CI? If so, it will need to be backported to older cabal release branches (ask maintainers for directions).

@philderbeast philderbeast force-pushed the add/fourmolu-on-off branch 2 times, most recently from 1ff59a2 to 6bfac7b Compare December 30, 2024 11:27
@philderbeast philderbeast added attention: needs-rebase re: code formatting Automated code formatting with Fourmolu or similar labels Dec 30, 2024
Copy link
Collaborator

@9999years 9999years left a comment

Choose a reason for hiding this comment

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

LGTM, thanks!

@philderbeast philderbeast force-pushed the add/fourmolu-on-off branch 2 times, most recently from 0893819 to d4aad76 Compare January 12, 2025 12:38
@mergify mergify bot added the ready and waiting Mergify is waiting out the cooldown period label Jan 16, 2025
@philderbeast
Copy link
Collaborator Author

Label merge+no rebase is necessary when the pull request is from an organisation.

@mergify mergify bot added the merge delay passed Applied (usually by Mergify) when PR approved and received no updates for 2 days label Jan 18, 2025
@mergify mergify bot merged commit dac8124 into haskell:master Jan 18, 2025
50 checks passed
@philderbeast
Copy link
Collaborator Author

Sorry I missed squashing these down to one. I'll make sure not to apply the merge label before doing that in future.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merge delay passed Applied (usually by Mergify) when PR approved and received no updates for 2 days merge+no rebase re: code formatting Automated code formatting with Fourmolu or similar ready and waiting Mergify is waiting out the cooldown period
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants