Skip to content

Commit 1d5b240

Browse files
committed
Merge bitcoin/bitcoin#30877: code style: update .editorconfig file
9556061 code style: update .editorconfig file (Sebastian Falbesoner) Pull request description: Updates the .editorconfig file, first introduced in 2021 (see PR #21123, commit 7a135d5) w.r.t. following changes: - consider Rust .rs files (relevant since #28076, commit bbbbdb0) - reflect build system change to CMake (#30454, #30664) - add setting for bare Makefile still used for depends builds Can be tested e.g. by using the editorconfig-vim plugin (https://github.com/editorconfig/editorconfig-vim). The PR is made under the assumption that the file is still considered useful, especially for new contributors. If people feel like that's not the case anymore, the alternative is to delete it, obviously. Top commit has no ACKs. Tree-SHA512: 8406b1caf31e310f7e17c607d97beac583481e71b4425e0be2bbd8207096aa374a70151b58aae5fdb648ef5ff5c7e1d0a2949e6de3355bdd2009d8353ee24af0
2 parents fea550b + 9556061 commit 1d5b240

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

.editorconfig

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,17 @@ insert_final_newline = true
1010
trim_trailing_whitespace = true
1111

1212
# Source code files
13-
[*.{h,cpp,py,sh}]
13+
[*.{h,cpp,rs,py,sh}]
1414
indent_size = 4
1515

16-
# .cirrus.yml, .fuzzbuzz.yml, etc.
16+
# .cirrus.yml, etc.
1717
[*.yml]
1818
indent_size = 2
1919

20-
# Makefiles
21-
[{*.am,Makefile.*.include}]
20+
# Makefiles (only relevant for depends build)
21+
[Makefile]
2222
indent_style = tab
2323

24-
# Autoconf scripts
25-
[configure.ac]
24+
# CMake files
25+
[{CMakeLists.txt,*.cmake,*.cmake.in}]
2626
indent_size = 2

0 commit comments

Comments
 (0)