[clang] 5ac784d - Revert "[clang-format][NFC] Don't use clang-format style in config files"

Owen Pan via cfe-commits cfe-commits at lists.llvm.org
Sat Mar 16 02:39:44 PDT 2024


Author: Owen Pan
Date: 2024-03-16T02:39:37-07:00
New Revision: 5ac784d1d00ce4733d07c3432ff946497a249e51

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

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

This reverts commit c69ec700adec315b3daa55742f2ef655242fa297, which has been
obsolete since commit dec63221d56e because the clang-format style was added
in version 18.

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 f95602cab0f7fc..d7331b3c8cf02e 100644
--- a/clang/include/clang/Format/.clang-format
+++ b/clang/include/clang/Format/.clang-format
@@ -1,6 +1 @@
-BasedOnStyle: LLVM
-InsertBraces: true
-InsertNewlineAtEOF: true
-LineEnding: LF
-RemoveBracesLLVM: true
-RemoveParentheses: ReturnStatement
+BasedOnStyle: clang-format

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

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

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


        


More information about the cfe-commits mailing list