[clang] c69ec70 - [clang-format][NFC] Don't use clang-format style in config files

Owen Pan via cfe-commits cfe-commits at lists.llvm.org
Wed Jan 10 00:58:43 PST 2024


Author: Owen Pan
Date: 2024-01-10T00:58:35-08:00
New Revision: c69ec700adec315b3daa55742f2ef655242fa297

URL: https://github.com/llvm/llvm-project/commit/c69ec700adec315b3daa55742f2ef655242fa297
DIFF: https://github.com/llvm/llvm-project/commit/c69ec700adec315b3daa55742f2ef655242fa297.diff

LOG: [clang-format][NFC] Don't use clang-format style in config files

The current CI doesn't use the latest clang-format and fails most
clang-format patches on the code formatting check. This patch
temporarily removes the clang-format style from the .clang-format
files.

Added: 
    

Modified: 
    clang/include/clang/Format/.clang-format
    clang/lib/Format/.clang-format
    clang/tools/clang-format/.clang-format
    clang/unittests/Format/.clang-format

Removed: 
    


################################################################################
diff  --git a/clang/include/clang/Format/.clang-format b/clang/include/clang/Format/.clang-format
index d7331b3c8cf02e..f95602cab0f7fc 100644
--- a/clang/include/clang/Format/.clang-format
+++ b/clang/include/clang/Format/.clang-format
@@ -1 +1,6 @@
-BasedOnStyle: clang-format
+BasedOnStyle: LLVM
+InsertBraces: true
+InsertNewlineAtEOF: true
+LineEnding: LF
+RemoveBracesLLVM: true
+RemoveParentheses: ReturnStatement

diff  --git a/clang/lib/Format/.clang-format b/clang/lib/Format/.clang-format
index d7331b3c8cf02e..f95602cab0f7fc 100644
--- a/clang/lib/Format/.clang-format
+++ b/clang/lib/Format/.clang-format
@@ -1 +1,6 @@
-BasedOnStyle: clang-format
+BasedOnStyle: LLVM
+InsertBraces: true
+InsertNewlineAtEOF: true
+LineEnding: LF
+RemoveBracesLLVM: true
+RemoveParentheses: ReturnStatement

diff  --git a/clang/tools/clang-format/.clang-format b/clang/tools/clang-format/.clang-format
index d7331b3c8cf02e..f95602cab0f7fc 100644
--- a/clang/tools/clang-format/.clang-format
+++ b/clang/tools/clang-format/.clang-format
@@ -1 +1,6 @@
-BasedOnStyle: clang-format
+BasedOnStyle: LLVM
+InsertBraces: true
+InsertNewlineAtEOF: true
+LineEnding: LF
+RemoveBracesLLVM: true
+RemoveParentheses: ReturnStatement

diff  --git a/clang/unittests/Format/.clang-format b/clang/unittests/Format/.clang-format
index d7331b3c8cf02e..f95602cab0f7fc 100644
--- a/clang/unittests/Format/.clang-format
+++ b/clang/unittests/Format/.clang-format
@@ -1 +1,6 @@
-BasedOnStyle: clang-format
+BasedOnStyle: LLVM
+InsertBraces: true
+InsertNewlineAtEOF: true
+LineEnding: LF
+RemoveBracesLLVM: true
+RemoveParentheses: ReturnStatement


        


More information about the cfe-commits mailing list