Author: owenca Date: 2022-05-13T16:16:20-07:00 New Revision: 2601355dc9822f8e04ad73212ed62e601e4f0368
URL: https://github.com/llvm/llvm-project/commit/2601355dc9822f8e04ad73212ed62e601e4f0368 DIFF: https://github.com/llvm/llvm-project/commit/2601355dc9822f8e04ad73212ed62e601e4f0368.diff LOG: [clang-format][NFC] Format unit tests with insert/remove braces This patch is the result of running clang-format version 753fe33 in clang/unittests/Format/: clang-format -style="{InsertBraces: true, RemoveBracesLLVM: true}" -i *.cpp *.h Differential Revision: https://reviews.llvm.org/D125510 Added: Modified: clang/unittests/Format/FormatTestUtils.h clang/unittests/Format/TokenAnnotatorTest.cpp Removed: ################################################################################ diff --git a/clang/unittests/Format/FormatTestUtils.h b/clang/unittests/Format/FormatTestUtils.h index fb75070db1cd..ace5a4519d20 100644 --- a/clang/unittests/Format/FormatTestUtils.h +++ b/clang/unittests/Format/FormatTestUtils.h @@ -53,10 +53,9 @@ inline std::string messUp(llvm::StringRef Code) { std::string WithoutWhitespace; if (MessedUp[0] != ' ') WithoutWhitespace.push_back(MessedUp[0]); - for (unsigned i = 1, e = MessedUp.size(); i != e; ++i) { + for (unsigned i = 1, e = MessedUp.size(); i != e; ++i) if (MessedUp[i] != ' ' || MessedUp[i - 1] != ' ') WithoutWhitespace.push_back(MessedUp[i]); - } return WithoutWhitespace; } diff --git a/clang/unittests/Format/TokenAnnotatorTest.cpp b/clang/unittests/Format/TokenAnnotatorTest.cpp index 138cab9b6b25..aa91f389a5d2 100644 --- a/clang/unittests/Format/TokenAnnotatorTest.cpp +++ b/clang/unittests/Format/TokenAnnotatorTest.cpp @@ -509,13 +509,15 @@ TEST_F(TokenAnnotatorTest, RequiresDoesNotChangeParsingOfTheRest) { NumberOfBaseTokens + NumberOfAdditionalRequiresClauseTokens) << ConstrainedTokens; - for (auto I = 0u; I < NumberOfBaseTokens; ++I) - if (I < NumberOfTokensBeforeRequires) + for (auto I = 0u; I < NumberOfBaseTokens; ++I) { + if (I < NumberOfTokensBeforeRequires) { EXPECT_EQ(*BaseTokens[I], *ConstrainedTokens[I]) << I; - else + } else { EXPECT_EQ(*BaseTokens[I], *ConstrainedTokens[I + NumberOfAdditionalRequiresClauseTokens]) << I; + } + } BaseTokens = annotate("template<typename T>\n" "struct Bar;"); @@ -529,13 +531,15 @@ TEST_F(TokenAnnotatorTest, RequiresDoesNotChangeParsingOfTheRest) { NumberOfBaseTokens + NumberOfAdditionalRequiresClauseTokens) << ConstrainedTokens; - for (auto I = 0u; I < NumberOfBaseTokens; ++I) - if (I < NumberOfTokensBeforeRequires) + for (auto I = 0u; I < NumberOfBaseTokens; ++I) { + if (I < NumberOfTokensBeforeRequires) { EXPECT_EQ(*BaseTokens[I], *ConstrainedTokens[I]) << I; - else + } else { EXPECT_EQ(*BaseTokens[I], *ConstrainedTokens[I + NumberOfAdditionalRequiresClauseTokens]) << I; + } + } BaseTokens = annotate("template<typename T>\n" "struct Bar {" @@ -555,13 +559,15 @@ TEST_F(TokenAnnotatorTest, RequiresDoesNotChangeParsingOfTheRest) { NumberOfBaseTokens + NumberOfAdditionalRequiresClauseTokens) << ConstrainedTokens; - for (auto I = 0u; I < NumberOfBaseTokens; ++I) - if (I < NumberOfTokensBeforeRequires) + for (auto I = 0u; I < NumberOfBaseTokens; ++I) { + if (I < NumberOfTokensBeforeRequires) { EXPECT_EQ(*BaseTokens[I], *ConstrainedTokens[I]) << I; - else + } else { EXPECT_EQ(*BaseTokens[I], *ConstrainedTokens[I + NumberOfAdditionalRequiresClauseTokens]) << I; + } + } BaseTokens = annotate("template<typename T>\n" "Bar(T) -> Bar<T>;"); @@ -575,13 +581,15 @@ TEST_F(TokenAnnotatorTest, RequiresDoesNotChangeParsingOfTheRest) { NumberOfBaseTokens + NumberOfAdditionalRequiresClauseTokens) << ConstrainedTokens; - for (auto I = 0u; I < NumberOfBaseTokens; ++I) - if (I < NumberOfTokensBeforeRequires) + for (auto I = 0u; I < NumberOfBaseTokens; ++I) { + if (I < NumberOfTokensBeforeRequires) { EXPECT_EQ(*BaseTokens[I], *ConstrainedTokens[I]) << I; - else + } else { EXPECT_EQ(*BaseTokens[I], *ConstrainedTokens[I + NumberOfAdditionalRequiresClauseTokens]) << I; + } + } BaseTokens = annotate("template<typename T>\n" "T foo();"); @@ -595,13 +603,15 @@ TEST_F(TokenAnnotatorTest, RequiresDoesNotChangeParsingOfTheRest) { NumberOfBaseTokens + NumberOfAdditionalRequiresClauseTokens) << ConstrainedTokens; - for (auto I = 0u; I < NumberOfBaseTokens; ++I) - if (I < NumberOfTokensBeforeRequires) + for (auto I = 0u; I < NumberOfBaseTokens; ++I) { + if (I < NumberOfTokensBeforeRequires) { EXPECT_EQ(*BaseTokens[I], *ConstrainedTokens[I]) << I; - else + } else { EXPECT_EQ(*BaseTokens[I], *ConstrainedTokens[I + NumberOfAdditionalRequiresClauseTokens]) << I; + } + } BaseTokens = annotate("template<typename T>\n" "T foo() {\n" @@ -621,13 +631,15 @@ TEST_F(TokenAnnotatorTest, RequiresDoesNotChangeParsingOfTheRest) { NumberOfBaseTokens + NumberOfAdditionalRequiresClauseTokens) << ConstrainedTokens; - for (auto I = 0u; I < NumberOfBaseTokens; ++I) - if (I < NumberOfTokensBeforeRequires) + for (auto I = 0u; I < NumberOfBaseTokens; ++I) { + if (I < NumberOfTokensBeforeRequires) { EXPECT_EQ(*BaseTokens[I], *ConstrainedTokens[I]) << I; - else + } else { EXPECT_EQ(*BaseTokens[I], *ConstrainedTokens[I + NumberOfAdditionalRequiresClauseTokens]) << I; + } + } BaseTokens = annotate("template<typename T>\n" "T foo();"); @@ -641,13 +653,15 @@ TEST_F(TokenAnnotatorTest, RequiresDoesNotChangeParsingOfTheRest) { NumberOfBaseTokens + NumberOfAdditionalRequiresClauseTokens) << ConstrainedTokens; - for (auto I = 0u; I < NumberOfBaseTokens; ++I) - if (I < NumberOfTokensBeforeRequires) + for (auto I = 0u; I < NumberOfBaseTokens; ++I) { + if (I < NumberOfTokensBeforeRequires) { EXPECT_EQ(*BaseTokens[I], *ConstrainedTokens[I]) << I; - else + } else { EXPECT_EQ(*BaseTokens[I], *ConstrainedTokens[I + NumberOfAdditionalRequiresClauseTokens]) << I; + } + } BaseTokens = annotate("template<typename T>\n" "T foo() {\n" @@ -666,13 +680,15 @@ TEST_F(TokenAnnotatorTest, RequiresDoesNotChangeParsingOfTheRest) { NumberOfBaseTokens + NumberOfAdditionalRequiresClauseTokens) << ConstrainedTokens; - for (auto I = 0u; I < NumberOfBaseTokens; ++I) - if (I < NumberOfTokensBeforeRequires) + for (auto I = 0u; I < NumberOfBaseTokens; ++I) { + if (I < NumberOfTokensBeforeRequires) { EXPECT_EQ(*BaseTokens[I], *ConstrainedTokens[I]) << I; - else + } else { EXPECT_EQ(*BaseTokens[I], *ConstrainedTokens[I + NumberOfAdditionalRequiresClauseTokens]) << I; + } + } BaseTokens = annotate("template<typename T>\n" "Bar(T) -> Bar<typename T::I>;"); @@ -690,13 +706,15 @@ TEST_F(TokenAnnotatorTest, RequiresDoesNotChangeParsingOfTheRest) { NumberOfBaseTokens + NumberOfAdditionalRequiresClauseTokens) << ConstrainedTokens; - for (auto I = 0u; I < NumberOfBaseTokens; ++I) - if (I < NumberOfTokensBeforeRequires) + for (auto I = 0u; I < NumberOfBaseTokens; ++I) { + if (I < NumberOfTokensBeforeRequires) { EXPECT_EQ(*BaseTokens[I], *ConstrainedTokens[I]) << I; - else + } else { EXPECT_EQ(*BaseTokens[I], *ConstrainedTokens[I + NumberOfAdditionalRequiresClauseTokens]) << I; + } + } BaseTokens = annotate("struct [[nodiscard]] zero_t {\n" " template<class T>\n" @@ -719,13 +737,15 @@ TEST_F(TokenAnnotatorTest, RequiresDoesNotChangeParsingOfTheRest) { NumberOfBaseTokens + NumberOfAdditionalRequiresClauseTokens) << ConstrainedTokens; - for (auto I = 0u; I < NumberOfBaseTokens; ++I) - if (I < NumberOfTokensBeforeRequires) + for (auto I = 0u; I < NumberOfBaseTokens; ++I) { + if (I < NumberOfTokensBeforeRequires) { EXPECT_EQ(*BaseTokens[I], *ConstrainedTokens[I]) << I; - else + } else { EXPECT_EQ(*BaseTokens[I], *ConstrainedTokens[I + NumberOfAdditionalRequiresClauseTokens]) << I; + } + } } TEST_F(TokenAnnotatorTest, UnderstandsAsm) { _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits