Upgrade to ormolu 0.1.2.0 #1145
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mheinzel
force-pushed
the
mheinzel/upgrade-ormolu
branch
from
96dc868
to
2826206
Compare
mheinzel
changed the title
mheinzel
force-pushed
the
mheinzel/upgrade-ormolu
branch
from
2826206
to
29a04a2
Compare
|
The failure of |
mheinzel
force-pushed
the
mheinzel/upgrade-ormolu
branch
from
29a04a2
to
b9430cd
Compare
We could already use the script without it being merged. Might even make sense so we can battle-test it and adjust it as we go. |
This decreases the diff resulting from running Ormolu 0.1.2.0 from 226 files changed, 2611 insertions(+), 2316 deletions(-) to 213 files changed, 1968 insertions(+), 1759 deletions(-)
mheinzel
force-pushed
the
mheinzel/upgrade-ormolu
branch
from
177bebf
to
9b395f7
Compare
mheinzel
added a commit
that referenced
this pull request
Jul 31, 2020
Upgrading Ormolu can be painful, because the style will often change in a lot of places (see for example #1145). Any active branches/PRs will then have to rebase onto these changes and resolve the resulting conflicts. It becomes a bit less cumbersome after first squashing all commits of the branch into a single one, but that's often not desirable. This script will automate the rebasing process, keeping the (linear) history of intact and making the commits appear as if the changes had been applied onto the newly-formatted version all along.
|
I'll merge this once the integration tests passed. (for reference, the |
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
See https://github.com/zinfra/backend-issues/issues/1623
Don't merge yet. We'll wait for a good moment where we don't have many PRs with Haskell changes in progress.
It should not take much time to rebase this PR then (if we just re-create the
run ormolucommit instead of rebasing it).Main Ormolu changes since 0.0.5.0 we care about:
Changes that cause most diffs: