Skip to content

A giant leap towards enforcing tools/check-typo on the entire repository#1288

Merged
dra27 merged 2 commits intoocaml:trunkfrom
dra27:check-typo-supreme
Jun 14, 2018
Merged

A giant leap towards enforcing tools/check-typo on the entire repository#1288
dra27 merged 2 commits intoocaml:trunkfrom
dra27:check-typo-supreme

Conversation

@dra27
Copy link
Copy Markdown
Member

@dra27 dra27 commented Aug 12, 2017

Follows on from #1287, which needs merging first. The actual changes are just the last commit - 1c28da8

@dra27
Copy link
Copy Markdown
Member Author

dra27 commented Aug 12, 2017

All the changes in this GPR relate to reducing line-lengths and fixing whitespace.

@damiendoligez damiendoligez added this to the 4.07-or-later milestone Sep 25, 2017
@dra27 dra27 mentioned this pull request Oct 11, 2017
3 tasks
@dra27 dra27 force-pushed the check-typo-supreme branch from 1c28da8 to 093ae0b Compare October 26, 2017 10:57
@dra27 dra27 removed the suspended label Oct 26, 2017
@dra27 dra27 force-pushed the check-typo-supreme branch 2 times, most recently from bd5dba4 to 9777a9d Compare October 26, 2017 14:59
@damiendoligez damiendoligez removed this from the consider-for-4.07 milestone Jun 5, 2018
@damiendoligez
Copy link
Copy Markdown
Member

@dra27 I think we should drop this PR and try again later (maybe piecewise?)

@dra27
Copy link
Copy Markdown
Member Author

dra27 commented Jun 6, 2018

I don't think it needs breaking up - just rebasing (and updating).

@damiendoligez
Copy link
Copy Markdown
Member

But won't it be too hard to rebase?

@dra27
Copy link
Copy Markdown
Member Author

dra27 commented Jun 7, 2018

No - I've already done it! Just testing it... it's revealed a couple of little changes to ocamltest, so once the whole testsuite is passing again, I'll split the new bits into separate pull requests and push the new version of this one just with whitespace/line-length altering changes.

@shindere
Copy link
Copy Markdown
Contributor

shindere commented Jun 7, 2018 via email

@dra27 dra27 force-pushed the check-typo-supreme branch from 9777a9d to c00e796 Compare June 8, 2018 14:41
@dra27 dra27 changed the title Enforce tools/check-typo on entire repository A giant leap towards enforcing tools/check-typo on the entire repository Jun 8, 2018
@dra27 dra27 force-pushed the check-typo-supreme branch from c00e796 to 8228d44 Compare June 8, 2018 14:42
@dra27
Copy link
Copy Markdown
Member Author

dra27 commented Jun 8, 2018

OK, this single commit contains fixes which are solely the correction of whitespace (with occasional knock-on consequences for the testsuite reference files) and overly long lines. Overly long lines are fixed using (hopefully) non-controversial string-splitting, etc.

This diff is much easier to look at using a whitespace-eliminating diff tool such as patdiff

@dra27
Copy link
Copy Markdown
Member Author

dra27 commented Jun 8, 2018

A clearer view of this diff may be found at http://people.ds.cam.ac.uk/dra27/gpr1288-patdiff.html

@dra27 dra27 mentioned this pull request Jun 8, 2018
4 tasks
@dra27 dra27 force-pushed the check-typo-supreme branch from 8228d44 to fc36b23 Compare June 13, 2018 09:45
@dra27 dra27 force-pushed the check-typo-supreme branch from fc36b23 to a9c85ba Compare June 14, 2018 10:05
@dra27
Copy link
Copy Markdown
Member Author

dra27 commented Jun 14, 2018

Rebased, partly to kick AppVeyor, and partly because this branch should now represent a fully check-typo passing trunk

@dra27
Copy link
Copy Markdown
Member Author

dra27 commented Jun 14, 2018

OK - assuming the revised version with GPR#1825 whitespace fixes passes, can this be merged? The patdiff-generated diff above is still correct (rebasing didn't have any conflicts).

Copy link
Copy Markdown
Member

@damiendoligez damiendoligez left a comment

Choose a reason for hiding this comment

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

I have reviewed the patdiff and everything looks correct.

@dra27
Copy link
Copy Markdown
Member Author

dra27 commented Jun 14, 2018

Thanks, @damiendoligez! Here goes, and apologies to everyone whose patches need updating...

@dra27 dra27 merged commit 4197e75 into ocaml:trunk Jun 14, 2018
@dra27 dra27 deleted the check-typo-supreme branch June 14, 2018 14:15
@shindere
Copy link
Copy Markdown
Contributor

shindere commented Jun 14, 2018 via email

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.

3 participants