- Notifications
You must be signed in to change notification settings - Fork14.5k
Minor formatting fix in 'generate_feature_test_macro_components'#148889
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 ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Merged
Uh oh!
There was an error while loading.Please reload this page.
Conversation
This file contains hidden or 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
@llvm/pr-subscribers-libcxx Author: Steve O'Brien (elsteveogrande) ChangesFixes a small annoyance where generated files have a format which does not agree with the one checked during For example Contains a number of changes: one actual change to the py script, and lots of resulting whitespace changes. My process for this was:
Patch is 41.33 KiB, truncated to 20.00 KiB below, full version:https://github.com/llvm/llvm-project/pull/148889.diff 76 Files Affected:
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/algorithm.version.compile.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/algorithm.version.compile.pass.cppindex 488bc468bce79..bc479f1bcb1e0 100644--- a/libcxx/test/std/language.support/support.limits/support.limits.general/algorithm.version.compile.pass.cpp+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/algorithm.version.compile.pass.cpp@@ -459,4 +459,3 @@ #endif // TEST_STD_VER > 23 // clang-format on-diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/any.version.compile.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/any.version.compile.pass.cppindex 7f3d6394749b4..fe0e6bd17f94d 100644--- a/libcxx/test/std/language.support/support.limits/support.limits.general/any.version.compile.pass.cpp+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/any.version.compile.pass.cpp@@ -69,4 +69,3 @@ #endif // TEST_STD_VER > 23 // clang-format on-diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/array.version.compile.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/array.version.compile.pass.cppindex 9e50976e5cc2c..30efb61893a1b 100644--- a/libcxx/test/std/language.support/support.limits/support.limits.general/array.version.compile.pass.cpp+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/array.version.compile.pass.cpp@@ -171,4 +171,3 @@ #endif // TEST_STD_VER > 23 // clang-format on-diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/atomic.version.compile.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/atomic.version.compile.pass.cppindex e6145bbed5af9..3470e2b28bc40 100644--- a/libcxx/test/std/language.support/support.limits/support.limits.general/atomic.version.compile.pass.cpp+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/atomic.version.compile.pass.cpp@@ -420,4 +420,3 @@ #endif // TEST_STD_VER > 23 // clang-format on-diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/barrier.version.compile.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/barrier.version.compile.pass.cppindex 0d025923728b7..a908c417df48b 100644--- a/libcxx/test/std/language.support/support.limits/support.limits.general/barrier.version.compile.pass.cpp+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/barrier.version.compile.pass.cpp@@ -86,4 +86,3 @@ #endif // TEST_STD_VER > 23 // clang-format on-diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/bit.version.compile.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/bit.version.compile.pass.cppindex 35033419ac440..cad025eee3373 100644--- a/libcxx/test/std/language.support/support.limits/support.limits.general/bit.version.compile.pass.cpp+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/bit.version.compile.pass.cpp@@ -195,4 +195,3 @@ #endif // TEST_STD_VER > 23 // clang-format on-diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/bitset.version.compile.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/bitset.version.compile.pass.cppindex ea61d99736208..8799a1f7d14e5 100644--- a/libcxx/test/std/language.support/support.limits/support.limits.general/bitset.version.compile.pass.cpp+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/bitset.version.compile.pass.cpp@@ -90,4 +90,3 @@ #endif // TEST_STD_VER > 23 // clang-format on-diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/charconv.version.compile.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/charconv.version.compile.pass.cppindex 52b02562dc5ab..6ec3037c9ea45 100644--- a/libcxx/test/std/language.support/support.limits/support.limits.general/charconv.version.compile.pass.cpp+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/charconv.version.compile.pass.cpp@@ -123,4 +123,3 @@ #endif // TEST_STD_VER > 23 // clang-format on-diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/chrono.version.compile.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/chrono.version.compile.pass.cppindex 1453938b01da0..d5d7a5da4a64d 100644--- a/libcxx/test/std/language.support/support.limits/support.limits.general/chrono.version.compile.pass.cpp+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/chrono.version.compile.pass.cpp@@ -108,4 +108,3 @@ #endif // TEST_STD_VER > 23 // clang-format on-diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/cmath.version.compile.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/cmath.version.compile.pass.cppindex 507c7ab6084f8..26ebe1e3ad6b1 100644--- a/libcxx/test/std/language.support/support.limits/support.limits.general/cmath.version.compile.pass.cpp+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/cmath.version.compile.pass.cpp@@ -204,4 +204,3 @@ #endif // TEST_STD_VER > 23 // clang-format on-diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/compare.version.compile.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/compare.version.compile.pass.cppindex 56759a88a7348..907535a087de2 100644--- a/libcxx/test/std/language.support/support.limits/support.limits.general/compare.version.compile.pass.cpp+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/compare.version.compile.pass.cpp@@ -66,4 +66,3 @@ #endif // TEST_STD_VER > 23 // clang-format on-diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/complex.version.compile.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/complex.version.compile.pass.cppindex b5efa984b456a..9a3a644ca5d64 100644--- a/libcxx/test/std/language.support/support.limits/support.limits.general/complex.version.compile.pass.cpp+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/complex.version.compile.pass.cpp@@ -105,4 +105,3 @@ #endif // TEST_STD_VER > 23 // clang-format on-diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/concepts.version.compile.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/concepts.version.compile.pass.cppindex d9b2c43ecbd12..e4058c2348f9b 100644--- a/libcxx/test/std/language.support/support.limits/support.limits.general/concepts.version.compile.pass.cpp+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/concepts.version.compile.pass.cpp@@ -66,4 +66,3 @@ #endif // TEST_STD_VER > 23 // clang-format on-diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/coroutine.version.compile.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/coroutine.version.compile.pass.cppindex b472b205f89d5..24a9eca1e2346 100644--- a/libcxx/test/std/language.support/support.limits/support.limits.general/coroutine.version.compile.pass.cpp+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/coroutine.version.compile.pass.cpp@@ -66,4 +66,3 @@ #endif // TEST_STD_VER > 23 // clang-format on-diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/cstddef.version.compile.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/cstddef.version.compile.pass.cppindex ccc034418cde0..bc65a7f3cae00 100644--- a/libcxx/test/std/language.support/support.limits/support.limits.general/cstddef.version.compile.pass.cpp+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/cstddef.version.compile.pass.cpp@@ -69,4 +69,3 @@ #endif // TEST_STD_VER > 23 // clang-format on-diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/cstdlib.version.compile.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/cstdlib.version.compile.pass.cppindex f250798c129ea..600fa2eb2e4f5 100644--- a/libcxx/test/std/language.support/support.limits/support.limits.general/cstdlib.version.compile.pass.cpp+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/cstdlib.version.compile.pass.cpp@@ -75,4 +75,3 @@ #endif // TEST_STD_VER > 23 // clang-format on-diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/cstring.version.compile.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/cstring.version.compile.pass.cppindex 675c918cac417..8445aa3cf0c48 100644--- a/libcxx/test/std/language.support/support.limits/support.limits.general/cstring.version.compile.pass.cpp+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/cstring.version.compile.pass.cpp@@ -66,4 +66,3 @@ #endif // TEST_STD_VER > 23 // clang-format on-diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/deque.version.compile.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/deque.version.compile.pass.cppindex eff8689be9fb8..b634f3253093e 100644--- a/libcxx/test/std/language.support/support.limits/support.limits.general/deque.version.compile.pass.cpp+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/deque.version.compile.pass.cpp@@ -201,4 +201,3 @@ #endif // TEST_STD_VER > 23 // clang-format on-diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/exception.version.compile.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/exception.version.compile.pass.cppindex 60d6418c7459a..11d5735007f5b 100644--- a/libcxx/test/std/language.support/support.limits/support.limits.general/exception.version.compile.pass.cpp+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/exception.version.compile.pass.cpp@@ -69,4 +69,3 @@ #endif // TEST_STD_VER > 23 // clang-format on-diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/execution.version.compile.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/execution.version.compile.pass.cppindex b843aab42e6eb..77a6455e23302 100644--- a/libcxx/test/std/language.support/support.limits/support.limits.general/execution.version.compile.pass.cpp+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/execution.version.compile.pass.cpp@@ -126,4 +126,3 @@ #endif // TEST_STD_VER > 23 // clang-format on-diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/expected.version.compile.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/expected.version.compile.pass.cppindex 9c7a84f145dde..74cf85ea9029f 100644--- a/libcxx/test/std/language.support/support.limits/support.limits.general/expected.version.compile.pass.cpp+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/expected.version.compile.pass.cpp@@ -129,4 +129,3 @@ #endif // TEST_STD_VER > 23 // clang-format on-diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/filesystem.version.compile.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/filesystem.version.compile.pass.cppindex 98acf8bb602ca..9c28db3bb0869 100644--- a/libcxx/test/std/language.support/support.limits/support.limits.general/filesystem.version.compile.pass.cpp+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/filesystem.version.compile.pass.cpp@@ -179,4 +179,3 @@ #endif // TEST_STD_VER > 23 // clang-format on-diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/flat_map.version.compile.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/flat_map.version.compile.pass.cppindex 19e2fd79a4295..9c06eee27e0c8 100644--- a/libcxx/test/std/language.support/support.limits/support.limits.general/flat_map.version.compile.pass.cpp+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/flat_map.version.compile.pass.cpp@@ -63,4 +63,3 @@ #endif // TEST_STD_VER > 23 // clang-format on-diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/flat_set.version.compile.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/flat_set.version.compile.pass.cppindex d078f9bda23c9..5985bdc2d7d4f 100644--- a/libcxx/test/std/language.support/support.limits/support.limits.general/flat_set.version.compile.pass.cpp+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/flat_set.version.compile.pass.cpp@@ -63,4 +63,3 @@ #endif // TEST_STD_VER > 23 // clang-format on-diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/format.version.compile.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/format.version.compile.pass.cppindex 3fa4334143b1a..77730f17fd9c6 100644--- a/libcxx/test/std/language.support/support.limits/support.limits.general/format.version.compile.pass.cpp+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/format.version.compile.pass.cpp@@ -147,4 +147,3 @@ #endif // TEST_STD_VER > 23 // clang-format on-diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/forward_list.version.compile.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/forward_list.version.compile.pass.cppindex 05f903dccafe7..d2082946597cb 100644--- a/libcxx/test/std/language.support/support.limits/support.limits.general/forward_list.version.compile.pass.cpp+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/forward_list.version.compile.pass.cpp@@ -297,4 +297,3 @@ #endif // TEST_STD_VER > 23 // clang-format on-diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/fstream.version.compile.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/fstream.version.compile.pass.cppindex ee32346d61080..f67adb0de1ded 100644--- a/libcxx/test/std/language.support/support.limits/support.limits.general/fstream.version.compile.pass.cpp+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/fstream.version.compile.pass.cpp@@ -68,4 +68,3 @@ #endif // TEST_STD_VER > 23 // clang-format on-diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/functional.version.compile.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/functional.version.compile.pass.cppindex 8c0820681188d..b7b7d0334830a 100644--- a/libcxx/test/std/language.support/support.limits/support.limits.general/functional.version.compile.pass.cpp+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/functional.version.compile.pass.cpp@@ -579,4 +579,3 @@ #endif // TEST_STD_VER > 23 // clang-format on-diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/iomanip.version.compile.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/iomanip.version.compile.pass.cppindex 37deba7c9661a..4de327cbfa26b 100644--- a/libcxx/test/std/language.support/support.limits/support.limits.general/iomanip.version.compile.pass.cpp+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/iomanip.version.compile.pass.cpp@@ -104,4 +104,3 @@ #endif // TEST_STD_VER > 23 // clang-format on-diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/ios.version.compile.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/ios.version.compile.pass.cppindex 179c3ce066b6f..68816936c55e9 100644--- a/libcxx/test/std/language.support/support.limits/support.limits.general/ios.version.compile.pass.cpp+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/ios.version.compile.pass.cpp@@ -65,4 +65,3 @@ #endif // TEST_STD_VER > 23 // clang-format on-diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/istream.version.compile.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/istream.version.compile.pass.cppindex 46238896f79c3..a1178b22776f1 100644--- a/libcxx/test/std/language.support/support.limits/support.limits.general/istream.version.compile.pass.cpp+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/istream.version.compile.pass.cpp@@ -86,4 +86,3 @@ #endif // TEST_STD_VER > 23 // clang-format on-diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/iterator.version.compile.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/iterator.version.compile.pass.cppindex 75dcb18a5428c..e9805ed4b1542 100644--- a/libcxx/test/std/language.support/support.limits/support.limits.general/iterator.version.compile.pass.cpp+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/iterator.version.compile.pass.cpp@@ -315,4 +315,3 @@ #endif // TEST_STD_VER > 23 // clang-format on-diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/latch.version.compile.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/latch.version.compile.pass.cppindex 6857c54460650..8e105648becef 100644--- a/libcxx/test/std/language.support/support.limits/support.limits.general/latch.version.compile.pass.cpp+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/latch.version.compile.pass.cpp@@ -86,4 +86,3 @@ #endif // TEST_STD_VER > 23 // clang-format on-diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/limits.version.compile.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/limits.version.compile.pass.cppindex 0b3d6f5d2bd9c..f4cc8db0f54cb 100644--- a/libcxx/test/std/language.support/support.limits/support.limits.general/limits.version.compile.pass.cpp+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/limits.version.compile.pass.cpp@@ -84,4 +84,3 @@ #endif // TEST_STD_VER > 23 // clang-format on-diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/list.version.compile.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/list.version.compile.pass.cppindex d10c61c0e9cf4..1407d74e03aa2 100644--- a/libcxx/test/std/language.support/support.limits/support.limits.general/list.version.compile.pass.cpp+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/list.version.compile.pass.cpp@@ -297,4 +297,3 @@ #endif // TEST_STD_VER > 23 // clang-format on-diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/locale.version.compile.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/locale.version.compile.pass.cppindex e1a04d1b0e087..f516881651b23 100644--- a/libcxx/test/std/language.support/support.limits/support.limits.general/locale.version.compile.pass.cpp+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/locale.version.compile.pass.cpp@@ -86,4 +86,3 @@ #endif // TEST_STD_VER > 23 // clang-format on-diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/map.version.compile.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/map.version.compile.pass.cppindex 4044c2b1b2e0f..3db3861c72b5c 100644--- a/libcxx/test/std/language.support/support.limits/support.limits.general/map.version.compile.pass.cpp+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/map....[truncated] |
ldionne approved these changesJul 15, 2025
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
I can confirm that files likelibcxx/test/std/language.support/support.limits/support.limits.general/algorithm.version.compile.pass.cpp are mis-formatted according to ourclang-format rules.
This seems to have been broken by#134543, although I can't find a rationale for that part of the change. Consequently, LGTM. Thanks for fixing!
Thanks@ldionne ! CI is looking good (except forone stuck job ...) |
a89e6f6 intollvm:main 79 checks passed
Uh oh!
There was an error while loading.Please reload this page.
Sign up for freeto 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.
Fixes a small annoyance where generated files have a format which does not agree with the one checked during
code-formatterin CI.For example
libcxx-generate-filesupdates (among possibly others) the*.version.compile.pass.cppfiles. Previously these files contained an extra newline which would fail the code format check. If you update that file manually to remove just that extra trailing newline, thencheck-generated-outputwill fail due to the file's contents differing from what's expected.Contains a number of changes: one actual change to the py script, and lots of resulting whitespace changes.
My process for this was:
generate_feature_test_macro_components: just remove an extra newline which causes the code-format step to fail$NINJA libcxx-generate-filesto rebuild all these.version.pass.cpp's