diff options
| author | merge-script <fanquake@gmail.com> | 2024-09-13 17:00:10 +0100 |
|---|---|---|
| committer | merge-script <fanquake@gmail.com> | 2024-09-13 17:00:10 +0100 |
| commit | 1d5b2406bb9ce619219a3b76608bd764a3b162c3 (patch) | |
| tree | 55d5c3d9f563e1e575cfa1d3328e4f3a74f4f472 | |
| parent | fea550b480c82dfdb743089a9ec8b91753156224 (diff) | |
| parent | 95560616fbab3ddca9d85980b7f73c8a816bc99e (diff) | |
Merge bitcoin/bitcoin#30877: code style: update .editorconfig file
95560616fbab3ddca9d85980b7f73c8a816bc99e code style: update .editorconfig file (Sebastian Falbesoner)
Pull request description:
Updates the .editorconfig file, first introduced in 2021 (see PR #21123, commit 7a135d57) w.r.t. following changes:
- consider Rust .rs files (relevant since #28076, commit bbbbdb0c)
- 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
| -rw-r--r-- | .editorconfig | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/.editorconfig b/.editorconfig index ae7e92d1c8..c5f3028c50 100644 --- a/.editorconfig +++ b/.editorconfig @@ -10,17 +10,17 @@ insert_final_newline = true trim_trailing_whitespace = true # Source code files -[*.{h,cpp,py,sh}] +[*.{h,cpp,rs,py,sh}] indent_size = 4 -# .cirrus.yml, .fuzzbuzz.yml, etc. +# .cirrus.yml, etc. [*.yml] indent_size = 2 -# Makefiles -[{*.am,Makefile.*.include}] +# Makefiles (only relevant for depends build) +[Makefile] indent_style = tab -# Autoconf scripts -[configure.ac] +# CMake files +[{CMakeLists.txt,*.cmake,*.cmake.in}] indent_size = 2 |