Prep-work for clang-format. #3078
Closed
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
added 4 commits
July 9, 2021 07:15
* Inserting clang-format using the same docker container as used for clang-tidy (silkeh/clang:12). * Removing stray semicolons (discovered by running clang-format v12 followed by tools/check-style.sh). * Manually moving `// NOLINT` and `// NOLINTNEXTLINE` comments so that clang-format does not move them to the wrong places. * Manually reformatting comments related to `static_assert`s so that clang-format does not need two passes. * git diff -U0 --no-color HEAD^ | python3 $HOME/clone/llvm-project/clang/tools/clang-format/clang-format-diff.py -p1 -style=file -i
…\endrst` blocks.
… the order and thereby confusing MSVC 2015.
…r the just-merged PR pybind#3080. Also rerunning clang-format-diff.py to pick up a few fixes missed before.
rwgk
force-pushed
the
prework_for_clang_format
branch
from
98e451b to
eb0a55b
Compare
Skylion007
reviewed
Jul 9, 2021
| @@ -105,6 +116,7 @@ class object_api : public pyobject_tag { | |||
| function will throw a `cast_error` exception. When the Python function | |||
| call fails, a `error_already_set` exception is thrown. | |||
| \endrst */ | |||
| // clang-format on | |||
There was a problem hiding this comment.
Wouldn't disabling reflow_comments be better? Or there may be some of there might be some way to get it to recognize \rst \endrst as off and on clang-format comments.
Skylion007
reviewed
Jul 9, 2021
Skylion007
reviewed
Jul 9, 2021
Skylion007
requested changes
Jul 9, 2021
This was referenced Jul 9, 2021
|
This one I will basically have to do from scratch after #3087 is done. At that point the only remaining clang-format related question should be how to deal with the |
|
This PR is obsolete. The only step left to do on top of the merged #3087 is somehow dealing with the |
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.
Prep-work for global clang-format (see experimental/demo PRs #3074, #3082).
NO bulk changes in this PR, just minimal changes such that a global clang-format is stable after a single pass.
This was several hours of tedious work running clang-format & clang-tidy until both are stable. Breaking out as a separate PR so that these manual changes do not have to be maintained separately while we decide how to integrate clang-format or clang-format-diff into the pre-commit hooks.
Notable steps:
Systematically adding
// clang-format off,onaround all\rst\endrstblocks. — Possibly some could be omitted, but for blocks that are deliberately formatted as\rstit is safer to systematically exclude them from clang-format. Note that the sphinx error messages are often completely useless if something goes wrong, therefore letting clang-format loose on\rstblocks is likely to turn into time-consuming surprises.Removing stray semicolons (discovered by running clang-format v12 followed by tools/check-style.sh).
Manually moving clang-tidy
// NOLINTand// NOLINTNEXTLINEcomments so that clang-format does not move them to the wrong places. (This was the most tedious part.)Manually reformatting comments related to
static_asserts so that clang-format does not need two passes.git diff -U0 --no-color HEAD^ | python3 $HOME/clone/llvm-project/clang/tools/clang-format/clang-format-diff.py -p1 -style=file -iSuggested changelog entry: