Reformat entire codebase (except Tolk) with clang-format 21

.clang-format

@@ -49,6 +49,16 @@ DisableFormat:   false
 ExperimentalAutoDetectBinPacking: false
 FixNamespaceComments: true
 # ForEachMacros: [ foreach, Q_FOREACH, BOOST_FOREACH ]
+IncludeBlocks: Regroup
+IncludeCategories:
+  - Regex:           '>$'
+    Priority:        -3
+  - Regex:           '.h>$'
+    Priority:        -2
+  - Regex:           '^\".*/.*\"$'
+    Priority:        -1
+  - Regex:           '^\"[^/]*\"$'
+    Priority:        0
 IndentCaseLabels: true
 IndentWidth:     2
 IndentWrappedFunctionNames: false
@@ -70,7 +80,7 @@ PenaltyExcessCharacter: 1000000
 PenaltyReturnTypeOnItsOwnLine: 200
 PointerAlignment: Left
 ReflowComments:  false # true
-SortIncludes: false # disabled, because we need case insensitive sort
+SortIncludes: true
 SpaceAfterCStyleCast: false
 SpaceAfterTemplateKeyword: true
 SpaceBeforeAssignmentOperators: true

.gitattributes

@@ -34,3 +34,7 @@ third_party/** linguist-vendored
 *.a binary
 *.jar binary
 *.tlo binary
+
+*.h merge=clang-format-driver
+*.cpp merge=clang-format-driver
+*.hpp merge=clang-format-driver

.github/workflows/build-ton-linux-x86-64-werror.yml

@@ -1,9 +1,9 @@
-name: Ubuntu TON -Werror build (shared, x86-64)
+name: Lint
 
 on: [push, pull_request, workflow_dispatch, workflow_call]
 
 jobs:
-  build:
+  lint:
     runs-on: ubuntu-24.04
 
     steps:
@@ -27,7 +27,7 @@ jobs:
       run: |
         wget https://apt.llvm.org/llvm.sh
         chmod +x llvm.sh
-        sudo ./llvm.sh 21 clang
+        sudo ./llvm.sh 21 all
 
     # TODO: Preserve ccache cache between runs once we get rid of warning suppression mappings.
 
@@ -41,3 +41,9 @@ jobs:
           -DTON_USE_LLD=On \
           -DTON_WERROR_BUILD=On
         ninja -C build
+
+    - name: Check C++ formatting
+      run: |
+        # TODO: Run clang-format only on changed files.
+        clang-format-21 -i $(git ls-files '*.h' '*.hpp' '*.cpp' ':!^example/android/third_party' ':!^tolk/')
+        git diff --exit-code

adnl/adnl-address-list.cpp

@@ -16,12 +16,13 @@
 
     Copyright 2017-2020 Telegram Systems LLP
 */
-#include "adnl-address-list.hpp"
-#include "adnl-peer-table.h"
 #include "auto/tl/ton_api.hpp"
-#include "td/utils/overloaded.h"
-#include "td/net/UdpServer.h"
 #include "keys/encryptor.h"
+#include "td/net/UdpServer.h"
+#include "td/utils/overloaded.h"
+
+#include "adnl-address-list.hpp"
+#include "adnl-peer-table.h"
 
 namespace ton {
 

adnl/adnl-address-list.h

@@ -18,9 +18,10 @@
 */
 #pragma once
 
-#include "adnl-network-manager.h"
 #include "crypto/common/refcnt.hpp"
 
+#include "adnl-network-manager.h"
+
 namespace ton {
 
 namespace adnl {

adnl/adnl-address-list.hpp

@@ -18,8 +18,8 @@
 */
 #pragma once
 
-#include "adnl-node-id.hpp"
 #include "adnl-address-list.h"
+#include "adnl-node-id.hpp"
 
 namespace ton {
 

adnl/adnl-channel.cpp

@@ -16,12 +16,12 @@
 
     Copyright 2017-2020 Telegram Systems LLP
 */
+#include "crypto/Ed25519.h"
+#include "td/utils/crypto.h"
+
 #include "adnl-channel.hpp"
-#include "adnl-peer.h"
 #include "adnl-peer-table.h"
-
-#include "td/utils/crypto.h"
-#include "crypto/Ed25519.h"
+#include "adnl-peer.h"
 
 namespace ton {
 

adnl/adnl-channel.h

@@ -19,9 +19,9 @@
 #pragma once
 
 #include "adnl-local-id.h"
-#include "adnl-peer.h"
-#include "adnl-peer-table.h"
 #include "adnl-network-manager.h"
+#include "adnl-peer-table.h"
+#include "adnl-peer.h"
 
 namespace ton {
 

adnl/adnl-channel.hpp

@@ -18,9 +18,10 @@
 */
 #pragma once
 
-#include "adnl-channel.h"
 #include "keys/encryptor.h"
 
+#include "adnl-channel.h"
+
 namespace ton {
 
 namespace adnl {

adnl/adnl-db.cpp

@@ -16,9 +16,10 @@
 
     Copyright 2017-2020 Telegram Systems LLP
 */
-#include "adnl-db.hpp"
 #include "td/db/RocksDb.h"
 
+#include "adnl-db.hpp"
+
 namespace ton {
 
 namespace adnl {

adnl/adnl-db.hpp

@@ -18,9 +18,10 @@
 */
 #pragma once
 
-#include "adnl-db.h"
 #include "td/db/KeyValue.h"
 
+#include "adnl-db.h"
+
 namespace ton {
 
 namespace adnl {

adnl/adnl-ext-client.cpp

@@ -16,8 +16,8 @@
 
     Copyright 2017-2020 Telegram Systems LLP
 */
-#include "adnl-ext-client.hpp"
 #include "adnl-ext-client.h"
+#include "adnl-ext-client.hpp"
 
 namespace ton {
 

adnl/adnl-ext-client.h

@@ -18,9 +18,10 @@
 */
 #pragma once
 
-#include "adnl-node-id.hpp"
 #include "td/utils/port/IPAddress.h"
 
+#include "adnl-node-id.hpp"
+
 namespace ton {
 
 namespace adnl {

adnl/adnl-ext-client.hpp

@@ -19,12 +19,13 @@
 #pragma once
 
 #include "auto/tl/lite_api.h"
-#include "adnl-ext-connection.hpp"
-#include "tl-utils/lite-utils.hpp"
-#include "td/utils/Random.h"
-#include "adnl-query.h"
 #include "keys/encryptor.h"
+#include "td/utils/Random.h"
+#include "tl-utils/lite-utils.hpp"
+
 #include "adnl-ext-client.h"
+#include "adnl-ext-connection.hpp"
+#include "adnl-query.h"
 
 namespace ton {
 
@@ -86,7 +87,7 @@ class AdnlExtClientImpl : public AdnlExtClient {
     if (!conn_.empty() && conn_.get() == conn) {
       callback_->on_stop_ready();
       conn_ = {};
-      for (auto& q : out_queries_) {
+      for (auto &q : out_queries_) {
         td::actor::send_closure(q.second, &AdnlQuery::set_error, td::Status::Error(ErrorCode::cancelled));
       }
       alarm_timestamp() = next_create_at_;

adnl/adnl-ext-connection.hpp

@@ -18,15 +18,15 @@
 */
 #pragma once
 
+#include <map>
+#include <set>
+
+#include "common/errorcode.h"
 #include "td/net/TcpListener.h"
-#include "td/utils/crypto.h"
 #include "td/utils/BufferedFd.h"
-#include "tl-utils/tl-utils.hpp"
 #include "td/utils/Random.h"
-#include "common/errorcode.h"
-
-#include <map>
-#include <set>
+#include "td/utils/crypto.h"
+#include "tl-utils/tl-utils.hpp"
 
 namespace ton {
 

adnl/adnl-ext-server.cpp

@@ -16,8 +16,9 @@
 
     Copyright 2017-2020 Telegram Systems LLP
 */
-#include "adnl-ext-server.hpp"
 #include "keys/encryptor.h"
+
+#include "adnl-ext-server.hpp"
 #include "utils.hpp"
 
 namespace ton {

adnl/adnl-ext-server.hpp

@@ -18,15 +18,16 @@
 */
 #pragma once
 
-#include "adnl-peer-table.h"
+#include <map>
+#include <set>
+
 #include "td/net/TcpListener.h"
-#include "td/utils/crypto.h"
 #include "td/utils/BufferedFd.h"
+#include "td/utils/crypto.h"
+
 #include "adnl-ext-connection.hpp"
 #include "adnl-ext-server.h"
-
-#include <map>
-#include <set>
+#include "adnl-peer-table.h"
 
 namespace ton {
 

adnl/adnl-local-id.cpp

@@ -16,11 +16,11 @@
 
     Copyright 2017-2020 Telegram Systems LLP
 */
-#include "td/utils/crypto.h"
+#include "keys/encryptor.h"
 #include "td/utils/Random.h"
+#include "td/utils/crypto.h"
 
 #include "adnl-local-id.h"
-#include "keys/encryptor.h"
 #include "utils.hpp"
 
 namespace ton {
@@ -41,7 +41,7 @@ AdnlAddressList AdnlLocalId::get_addr_list() const {
 }
 
 void AdnlLocalId::receive(td::IPAddress addr, td::BufferSlice data) {
-  InboundRateLimiter& rate_limiter = inbound_rate_limiter_[addr];
+  InboundRateLimiter &rate_limiter = inbound_rate_limiter_[addr];
   if (!rate_limiter.rate_limiter.take()) {
     VLOG(ADNL_NOTICE) << this << ": dropping IN message: rate limit exceeded";
     add_dropped_packet_stats(addr);
@@ -371,7 +371,6 @@ tl_object_ptr<ton_api::adnl_stats_localIdPackets> AdnlLocalId::PacketStats::tl(b
   return obj;
 }
 
-
 }  // namespace adnl
 
 }  // namespace ton

adnl/adnl-local-id.h

@@ -20,12 +20,11 @@
 
 #include <map>
 
-#include "td/actor/actor.h"
-#include "td/utils/BufferedUdp.h"
 #include "auto/tl/ton_api.h"
-#include "keys/encryptor.h"
-#include "adnl-peer-table.h"
 #include "dht/dht.h"
+#include "keys/encryptor.h"
+#include "td/actor/actor.h"
+#include "td/utils/BufferedUdp.h"
 
 #include "adnl-peer-table.h"
 #include "utils.hpp"

adnl/adnl-message.h

@@ -18,8 +18,8 @@
 */
 #pragma once
 
-#include "adnl/adnl.h"
 #include "adnl/adnl-query.h"
+#include "adnl/adnl.h"
 
 namespace ton {
 

adnl/adnl-network-manager.cpp

@@ -16,13 +16,12 @@
 
     Copyright 2017-2020 Telegram Systems LLP
 */
-#include "adnl-network-manager.hpp"
-#include "adnl-peer-table.h"
-
 #include "auto/tl/ton_api.hpp"
-
 #include "td/utils/overloaded.h"
 
+#include "adnl-network-manager.hpp"
+#include "adnl-peer-table.h"
+
 namespace ton {
 
 namespace adnl {

adnl/adnl-network-manager.h

@@ -18,16 +18,15 @@
 */
 #pragma once
 
-#include "td/actor/actor.h"
+#include <bitset>
 
 #include "td/actor/PromiseFuture.h"
+#include "td/actor/actor.h"
 #include "td/utils/port/IPAddress.h"
 
 #include "adnl-node-id.hpp"
 #include "adnl-proxy-types.h"
 
-#include <bitset>
-
 namespace td {
 class UdpServer;
 }

adnl/adnl-network-manager.hpp

@@ -18,17 +18,17 @@
 */
 #pragma once
 
+#include <map>
+
+#include "td/actor/PromiseFuture.h"
 #include "td/actor/actor.h"
-#include "td/utils/BufferedUdp.h"
-#include "td/net/UdpServer.h"
 #include "td/net/TcpListener.h"
+#include "td/net/UdpServer.h"
+#include "td/utils/BufferedUdp.h"
 
-#include "td/actor/PromiseFuture.h"
 #include "adnl-network-manager.h"
 #include "adnl-received-mask.h"
 
-#include <map>
-
 namespace td {
 class UdpServer;
 }