Restoring authorship annotation for <a-romanov@yandex-team.ru>. Commit 2 of 2.

50 files changed, 366 insertions, 366 deletions

diff --git a/library/cpp/actors/core/buffer.cpp b/library/cpp/actors/core/buffer.cpp
index a949e2ab0f..48128d76ef 100644
--- a/library/cpp/actors/core/buffer.cpp
+++ b/library/cpp/actors/core/buffer.cpp
@@ -1,93 +1,93 @@
-#include "buffer.h" 
- 
-#include <util/system/yassert.h> 
- 
+#include "buffer.h"
+
+#include <util/system/yassert.h>
+
 #include <algorithm>
- 
-TBufferBase::TBufferBase(size_t size) noexcept 
-    : Size(size) 
+
+TBufferBase::TBufferBase(size_t size) noexcept
+    : Size(size)
 {
 }
- 
-size_t 
+
+size_t
 TBufferBase::GetSize() const noexcept {
     return Size;
-} 
- 
+}
+
 void TBufferBase::SetSize(size_t size) noexcept {
     Size = size;
-} 
- 
-///////////////////////////////////////////////////////////////////// 
- 
+}
+
+/////////////////////////////////////////////////////////////////////
+
 template <typename PointerType>
-TBufferBaseT<PointerType>::TBufferBaseT(PointerType data, size_t size) noexcept 
+TBufferBaseT<PointerType>::TBufferBaseT(PointerType data, size_t size) noexcept
     : TBufferBase(size)
     , Data(data)
 {
 }
- 
+
 template <typename PointerType>
-PointerType 
+PointerType
 TBufferBaseT<PointerType>::GetPointer() const noexcept {
     return Data;
-} 
- 
+}
+
 template <typename PointerType>
 void TBufferBaseT<PointerType>::Assign(PointerType data, size_t size) noexcept {
     Data = data;
     Size = size;
-} 
- 
+}
+
 template <>
 void TBufferBaseT<void*>::Cut(size_t offset) noexcept {
     Y_VERIFY_DEBUG(offset <= Size);
     Data = static_cast<char*>(Data) + offset;
     TBufferBase::Size -= offset;
-} 
- 
+}
+
 template <>
 void TBufferBaseT<const void*>::Cut(size_t offset) noexcept {
     Y_VERIFY_DEBUG(offset <= Size);
     Data = static_cast<const char*>(Data) + offset;
     TBufferBase::Size -= offset;
-} 
- 
-template class TBufferBaseT<void*>; 
-template class TBufferBaseT<const void*>; 
- 
-///////////////////////////////////////////////////////////////////// 
- 
-TConstBuffer::TConstBuffer(const void* data, size_t size) noexcept 
-    : TBufferBaseT<const void*>(data, size) 
+}
+
+template class TBufferBaseT<void*>;
+template class TBufferBaseT<const void*>;
+
+/////////////////////////////////////////////////////////////////////
+
+TConstBuffer::TConstBuffer(const void* data, size_t size) noexcept
+    : TBufferBaseT<const void*>(data, size)
 {
 }
- 
-TConstBuffer::TConstBuffer(const TMutableBuffer& buffer) noexcept 
-    : TBufferBaseT<const void*>(buffer.GetPointer(), buffer.GetSize()) 
+
+TConstBuffer::TConstBuffer(const TMutableBuffer& buffer) noexcept
+    : TBufferBaseT<const void*>(buffer.GetPointer(), buffer.GetSize())
 {
 }
- 
-TConstBuffer 
+
+TConstBuffer
 TConstBuffer::Offset(ptrdiff_t offset, size_t size) const noexcept {
     return TConstBuffer(static_cast<const char*>(Data) + offset, std::min(Size - offset, size));
-} 
- 
-//////////////////////////////////////////////////////////////////////////////// 
- 
-TMutableBuffer::TMutableBuffer(void* data, size_t size) noexcept 
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+TMutableBuffer::TMutableBuffer(void* data, size_t size) noexcept
     : TBufferBaseT<void*>(data, size)
 {
 }
- 
-TMutableBuffer 
+
+TMutableBuffer
 TMutableBuffer::Offset(ptrdiff_t offset, size_t size) const noexcept {
     return TMutableBuffer(static_cast<char*>(Data) + offset, std::min(Size - offset, size));
-} 
- 
-size_t 
+}
+
+size_t
 TMutableBuffer::CopyFrom(const TConstBuffer& buffer) const noexcept {
     const auto size = std::min(Size, buffer.Size);
     std::memcpy(Data, buffer.Data, size);
     return size;
-} 
+}
diff --git a/library/cpp/actors/core/buffer.h b/library/cpp/actors/core/buffer.h
index 459b788b27..95425046d6 100644
--- a/library/cpp/actors/core/buffer.h
+++ b/library/cpp/actors/core/buffer.h
@@ -1,62 +1,62 @@
-#pragma once 
- 
+#pragma once
+
 #include <limits>
- 
-class TConstBuffer; 
-class TMutableBuffer; 
- 
+
+class TConstBuffer;
+class TMutableBuffer;
+
 class TBufferBase {
-public: 
-    size_t GetSize() const noexcept; 
- 
-    void SetSize(size_t newSize) noexcept; 
- 
-protected: 
-    TBufferBase(size_t size = 0) noexcept; 
- 
-    size_t Size; 
-}; 
- 
+public:
+    size_t GetSize() const noexcept;
+
+    void SetSize(size_t newSize) noexcept;
+
+protected:
+    TBufferBase(size_t size = 0) noexcept;
+
+    size_t Size;
+};
+
 template <typename PointerType>
 class TBufferBaseT: public TBufferBase {
-public: 
-    PointerType GetPointer() const noexcept; 
- 
-    void Cut(size_t offset) noexcept; 
- 
-    void Assign(PointerType data = nullptr, size_t size = 0U) noexcept; 
- 
-protected: 
-    TBufferBaseT(PointerType data, size_t size) noexcept; 
- 
-    PointerType Data; 
-}; 
- 
-/// Represents constant memory buffer, but do not owns it. 
+public:
+    PointerType GetPointer() const noexcept;
+
+    void Cut(size_t offset) noexcept;
+
+    void Assign(PointerType data = nullptr, size_t size = 0U) noexcept;
+
+protected:
+    TBufferBaseT(PointerType data, size_t size) noexcept;
+
+    PointerType Data;
+};
+
+/// Represents constant memory buffer, but do not owns it.
 class TConstBuffer: public TBufferBaseT<const void*> {
     friend class TMutableBuffer;
 
-public: 
+public:
     TConstBuffer(const TMutableBuffer& buffer) noexcept;
- 
+
     TConstBuffer(const void* data = nullptr, size_t size = 0U) noexcept;
- 
+
     TConstBuffer Offset(ptrdiff_t offset, size_t size = std::numeric_limits<size_t>::max()) const noexcept;
-}; 
- 
-/// Represents mutable memory buffer, but do not owns it. 
+};
+
+/// Represents mutable memory buffer, but do not owns it.
 class TMutableBuffer: public TBufferBaseT<void*> {
     friend class TConstBuffer;
 
-public: 
+public:
     TMutableBuffer(void* data = nullptr, size_t size = 0U) noexcept;
- 
+
     TMutableBuffer(const TMutableBuffer& value) noexcept
         : TBufferBaseT<void*>(value)
     {
     }
- 
+
     TMutableBuffer Offset(ptrdiff_t offset, size_t size = std::numeric_limits<size_t>::max()) const noexcept;
- 
+
     size_t CopyFrom(const TConstBuffer& buffer) const noexcept;
-}; 
+};
diff --git a/library/cpp/actors/core/event.h b/library/cpp/actors/core/event.h
index 17edf0d436..6ff02aaf94 100644
--- a/library/cpp/actors/core/event.h
+++ b/library/cpp/actors/core/event.h
@@ -116,18 +116,18 @@ namespace NActors {
 
         static const size_t ChannelBits = 12;
         static const size_t ChannelShift = (sizeof(ui32) << 3) - ChannelBits;
- 
+
 #ifdef USE_ACTOR_CALLSTACK
         TCallstack Callstack;
 #endif
         ui16 GetChannel() const noexcept {
             return Flags >> ChannelShift;
         }
- 
+
         ui64 GetSubChannel() const noexcept {
             return Flags & FlagUseSubChannel ? Sender.LocalId() : 0ULL;
         }
- 
+
         static ui32 MakeFlags(ui32 channel, ui32 flags) {
             Y_VERIFY(channel < (1 << ChannelBits));
             Y_VERIFY(flags < (1 << ChannelShift));
@@ -249,7 +249,7 @@ namespace NActors {
                 return 0;
             }
         }
- 
+
         bool HasBuffer() const {
             return bool(Buffer);
         }
diff --git a/library/cpp/actors/core/events.h b/library/cpp/actors/core/events.h
index 12d7b6899f..702cf50fad 100644
--- a/library/cpp/actors/core/events.h
+++ b/library/cpp/actors/core/events.h
@@ -58,15 +58,15 @@ namespace NActors {
                 : Blob(blob)
             {
             }
- 
+
             TString ToStringHeader() const noexcept override {
                 return "THelloWorld::Blob";
             }
- 
+
             bool SerializeToArcadiaStream(TChunkSerializer *serializer) const override {
                 return serializer->WriteString(&Blob);
             }
- 
+
             static IEventBase* Load(TEventSerializedData* bufs) noexcept {
                 return new TEvBlob(bufs->GetString());
             }
@@ -75,7 +75,7 @@ namespace NActors {
                 return true;
             }
         };
- 
+
         struct TSystem {
             enum {
                 Start = EventSpaceBegin(ES_SYSTEM),
@@ -103,7 +103,7 @@ namespace NActors {
                 PoisonPill = Poison,
                 ActorDied = Gone,
             };
- 
+
             static_assert(End < EventSpaceEnd(ES_SYSTEM), "expect End < EventSpaceEnd(ES_SYSTEM)");
         };
 
@@ -130,7 +130,7 @@ namespace NActors {
         struct TEvUnsubscribe: public TEventBase<TEvUnsubscribe, TSystem::Unsubscribe> {
             DEFINE_SIMPLE_LOCAL_EVENT(TEvUnsubscribe, "System: TEvUnsubscribe")
         };
- 
+
         struct TEvUndelivered: public TEventBase<TEvUndelivered, TSystem::Undelivered> {
             enum EReason {
                 ReasonUnknown,
@@ -141,7 +141,7 @@ namespace NActors {
             const EReason Reason;
             const bool Unsure;
             const TString Data;
- 
+
             TEvUndelivered(ui32 sourceType, ui32 reason, bool unsure = false)
                 : SourceType(sourceType)
                 , Reason(static_cast<EReason>(reason))
diff --git a/library/cpp/actors/core/interconnect.h b/library/cpp/actors/core/interconnect.h
index 81dbde2c4d..679a4b8cc6 100644
--- a/library/cpp/actors/core/interconnect.h
+++ b/library/cpp/actors/core/interconnect.h
@@ -162,7 +162,7 @@ namespace NActors {
             }
             const ui32 NodeId;
         };
- 
+
         struct TEvNodeDisconnected: public TEventLocal<TEvNodeDisconnected, EvNodeDisconnected> {
             DEFINE_SIMPLE_LOCAL_EVENT(TEvNodeDisconnected, "TEvInterconnect::TEvNodeDisconnected")
             TEvNodeDisconnected(ui32 node) noexcept
@@ -171,10 +171,10 @@ namespace NActors {
             }
             const ui32 NodeId;
         };
- 
+
         struct TEvRegisterNode;
         struct TEvRegisterNodeResult;
- 
+
         struct TEvListNodes: public TEventLocal<TEvListNodes, EvListNodes> {
         };
 
diff --git a/library/cpp/actors/testlib/test_runtime.cpp b/library/cpp/actors/testlib/test_runtime.cpp
index 8df586041e..6fa25b9965 100644
--- a/library/cpp/actors/testlib/test_runtime.cpp
+++ b/library/cpp/actors/testlib/test_runtime.cpp
@@ -62,9 +62,9 @@ namespace NActors {
     }
 
     void TTestActorRuntimeBase::TNodeDataBase::Stop() {
-        if (Poller) 
-            Poller->Stop(); 
- 
+        if (Poller)
+            Poller->Stop();
+
         if (MailboxTable) {
             for (ui32 round = 0; !MailboxTable->Cleanup(); ++round)
                 Y_VERIFY(round < 10, "cyclic event/actor spawn while trying to shutdown actorsystem stub");
@@ -72,7 +72,7 @@ namespace NActors {
 
         if (ActorSystem)
             ActorSystem->Stop();
- 
+
         ActorSystem.Destroy();
         Poller.Reset();
     }
@@ -684,37 +684,37 @@ namespace NActors {
 
     TTestActorRuntimeBase::TEventObserver TTestActorRuntimeBase::SetObserverFunc(TEventObserver observerFunc) {
         TGuard<TMutex> guard(Mutex);
-        auto result = ObserverFunc; 
-        ObserverFunc = observerFunc; 
-        return result; 
+        auto result = ObserverFunc;
+        ObserverFunc = observerFunc;
+        return result;
     }
 
     TTestActorRuntimeBase::TScheduledEventsSelector TTestActorRuntimeBase::SetScheduledEventsSelectorFunc(TScheduledEventsSelector scheduledEventsSelectorFunc) {
         TGuard<TMutex> guard(Mutex);
-        auto result = ScheduledEventsSelectorFunc; 
-        ScheduledEventsSelectorFunc = scheduledEventsSelectorFunc; 
-        return result; 
+        auto result = ScheduledEventsSelectorFunc;
+        ScheduledEventsSelectorFunc = scheduledEventsSelectorFunc;
+        return result;
     }
 
     TTestActorRuntimeBase::TEventFilter TTestActorRuntimeBase::SetEventFilter(TEventFilter filterFunc) {
         TGuard<TMutex> guard(Mutex);
-        auto result = EventFilterFunc; 
-        EventFilterFunc = filterFunc; 
-        return result; 
+        auto result = EventFilterFunc;
+        EventFilterFunc = filterFunc;
+        return result;
     }
 
     TTestActorRuntimeBase::TScheduledEventFilter TTestActorRuntimeBase::SetScheduledEventFilter(TScheduledEventFilter filterFunc) {
         TGuard<TMutex> guard(Mutex);
-        auto result = ScheduledEventFilterFunc; 
-        ScheduledEventFilterFunc = filterFunc; 
-        return result; 
+        auto result = ScheduledEventFilterFunc;
+        ScheduledEventFilterFunc = filterFunc;
+        return result;
     }
 
     TTestActorRuntimeBase::TRegistrationObserver TTestActorRuntimeBase::SetRegistrationObserverFunc(TRegistrationObserver observerFunc) {
         TGuard<TMutex> guard(Mutex);
-        auto result = RegistrationObserver; 
-        RegistrationObserver = observerFunc; 
-        return result; 
+        auto result = RegistrationObserver;
+        RegistrationObserver = observerFunc;
+        return result;
     }
 
     bool TTestActorRuntimeBase::IsVerbose() {
@@ -1641,7 +1641,7 @@ namespace NActors {
         }
 
         const auto& interconnectCounters = GetCountersForComponent(node->DynamicCounters, "interconnect");
- 
+
         setup->LocalServices = node->LocalServices;
         setup->Interconnect.ProxyActors.resize(FirstNodeId + NodeCount);
         const TActorId nameserviceId = GetNameserviceActorId();
diff --git a/library/cpp/actors/testlib/test_runtime.h b/library/cpp/actors/testlib/test_runtime.h
index 356c073868..26e3b45c98 100644
--- a/library/cpp/actors/testlib/test_runtime.h
+++ b/library/cpp/actors/testlib/test_runtime.h
@@ -30,8 +30,8 @@
 #include <util/system/valgrind.h>
 #include <utility>
 
-#include <functional> 
- 
+#include <functional>
+
 const TDuration DEFAULT_DISPATCH_TIMEOUT = NSan::PlainOrUnderSanitizer(
         NValgrind::PlainOrUnderValgrind(TDuration::Seconds(60), TDuration::Seconds(120)),
         TDuration::Seconds(120)
@@ -355,7 +355,7 @@ namespace NActors {
 
         template <typename TEvent>
         TEvent* GrabEdgeEvent(TAutoPtr<IEventHandle>& handle, TDuration simTimeout = TDuration::Max()) {
-            std::function<bool(const TEvent&)> truth = [](const TEvent&) { return true; }; 
+            std::function<bool(const TEvent&)> truth = [](const TEvent&) { return true; };
             return GrabEdgeEventIf(handle, truth, simTimeout);
         }
 
@@ -644,7 +644,7 @@ namespace NActors {
     }
 
     template <typename TEvent>
-    TEvent* FindEvent(TEventsList& events, const std::function<bool(const TEvent&)>& predicate) { 
+    TEvent* FindEvent(TEventsList& events, const std::function<bool(const TEvent&)>& predicate) {
         for (auto& event : events) {
             if (event && event->GetTypeRewrite() == TEvent::EventType && predicate(*static_cast<TEvent*>(event->GetBase()))) {
                 return static_cast<TEvent*>(event->GetBase());
@@ -669,7 +669,7 @@ namespace NActors {
 
     template <typename TEvent>
     TEvent* GrabEvent(TEventsList& events, TAutoPtr<IEventHandle>& ev,
-        const std::function<bool(const typename TEvent::TPtr&)>& predicate) { 
+        const std::function<bool(const typename TEvent::TPtr&)>& predicate) {
         ev.Destroy();
         for (auto& event : events) {
             if (event && event->GetTypeRewrite() == TEvent::EventType) {
diff --git a/library/cpp/actors/util/funnel_queue.h b/library/cpp/actors/util/funnel_queue.h
index 35dec61f2a..0e21e2617c 100644
--- a/library/cpp/actors/util/funnel_queue.h
+++ b/library/cpp/actors/util/funnel_queue.h
@@ -1,96 +1,96 @@
-#pragma once 
- 
-#include <util/system/atomic.h> 
-#include <util/generic/noncopyable.h> 
- 
+#pragma once
+
+#include <util/system/atomic.h>
+#include <util/generic/noncopyable.h>
+
 template <typename ElementType>
 class TFunnelQueue: private TNonCopyable {
-public: 
-    TFunnelQueue() noexcept 
+public:
+    TFunnelQueue() noexcept
         : Front(nullptr)
         , Back(nullptr)
     {
     }
- 
+
     virtual ~TFunnelQueue() noexcept {
-        for (auto entry = Front; entry; entry = DeleteEntry(entry)) 
-            continue; 
-    } 
- 
-    /// Push element. Can be used from many threads. Return true if is first element. 
-    bool 
+        for (auto entry = Front; entry; entry = DeleteEntry(entry))
+            continue;
+    }
+
+    /// Push element. Can be used from many threads. Return true if is first element.
+    bool
     Push(ElementType&& element) noexcept {
         TEntry* const next = NewEntry(static_cast<ElementType&&>(element));
         TEntry* const prev = AtomicSwap(&Back, next);
         AtomicSet(prev ? prev->Next : Front, next);
-        return !prev; 
-    } 
- 
-    /// Extract top element. Must be used only from one thread. Return true if have more. 
-    bool 
+        return !prev;
+    }
+
+    /// Extract top element. Must be used only from one thread. Return true if have more.
+    bool
     Pop() noexcept {
         if (TEntry* const top = AtomicGet(Front)) {
-            const auto last = AtomicCas(&Back, nullptr, top); 
-            if (last) // This is last element in queue. Queue is empty now. 
-                AtomicCas(&Front, nullptr, top); 
-            else // This element is not last. 
-                for (;;) { 
-                    if (const auto next = AtomicGet(top->Next)) { 
-                        AtomicSet(Front, next); 
-                        break; 
-                    } 
-                    // But Next is null. Wait next assignment in spin lock. 
-                } 
- 
-            DeleteEntry(top); 
-            return !last; 
-        } 
- 
-        return false; 
-    } 
- 
-    /// Peek top element. Must be used only from one thread. 
-    ElementType& 
+            const auto last = AtomicCas(&Back, nullptr, top);
+            if (last) // This is last element in queue. Queue is empty now.
+                AtomicCas(&Front, nullptr, top);
+            else // This element is not last.
+                for (;;) {
+                    if (const auto next = AtomicGet(top->Next)) {
+                        AtomicSet(Front, next);
+                        break;
+                    }
+                    // But Next is null. Wait next assignment in spin lock.
+                }
+
+            DeleteEntry(top);
+            return !last;
+        }
+
+        return false;
+    }
+
+    /// Peek top element. Must be used only from one thread.
+    ElementType&
     Top() const noexcept {
         return AtomicGet(Front)->Data;
-    } 
- 
-    bool 
+    }
+
+    bool
     IsEmpty() const noexcept {
-        return !AtomicGet(Front); 
-    } 
- 
-protected: 
+        return !AtomicGet(Front);
+    }
+
+protected:
     class TEntry: private TNonCopyable {
         friend class TFunnelQueue;
 
-    private: 
-        explicit TEntry(ElementType&& element) noexcept 
+    private:
+        explicit TEntry(ElementType&& element) noexcept
             : Data(static_cast<ElementType&&>(element))
             , Next(nullptr)
         {
         }
- 
+
         ~TEntry() noexcept {
         }
- 
-    public: 
-        ElementType Data; 
+
+    public:
+        ElementType Data;
         TEntry* volatile Next;
-    }; 
- 
+    };
+
     TEntry* volatile Front;
     TEntry* volatile Back;
- 
+
     virtual TEntry* NewEntry(ElementType&& element) noexcept {
-        return new TEntry(static_cast<ElementType&&>(element)); 
-    } 
- 
+        return new TEntry(static_cast<ElementType&&>(element));
+    }
+
     virtual TEntry* DeleteEntry(TEntry* entry) noexcept {
-        const auto next = entry->Next; 
-        delete entry; 
-        return next; 
-    } 
+        const auto next = entry->Next;
+        delete entry;
+        return next;
+    }
 
 protected:
     struct TEntryIter {
@@ -166,75 +166,75 @@ public:
     const_iterator end() const {
         return {nullptr};
     }
-}; 
- 
+};
+
 template <typename ElementType>
 class TPooledFunnelQueue: public TFunnelQueue<ElementType> {
-public: 
-    TPooledFunnelQueue() noexcept 
-        : Stack(nullptr) 
+public:
+    TPooledFunnelQueue() noexcept
+        : Stack(nullptr)
     {
     }
- 
+
     virtual ~TPooledFunnelQueue() noexcept override {
-        for (auto entry = TBase::Front; entry; entry = TBase::DeleteEntry(entry)) 
-            continue; 
-        for (auto entry = Stack; entry; entry = TBase::DeleteEntry(entry)) 
-            continue; 
-        TBase::Back = TBase::Front = Stack = nullptr; 
-    } 
- 
-private: 
-    typedef TFunnelQueue<ElementType> TBase; 
- 
+        for (auto entry = TBase::Front; entry; entry = TBase::DeleteEntry(entry))
+            continue;
+        for (auto entry = Stack; entry; entry = TBase::DeleteEntry(entry))
+            continue;
+        TBase::Back = TBase::Front = Stack = nullptr;
+    }
+
+private:
+    typedef TFunnelQueue<ElementType> TBase;
+
     typename TBase::TEntry* volatile Stack;
- 
-protected: 
+
+protected:
     virtual typename TBase::TEntry* NewEntry(ElementType&& element) noexcept override {
         while (const auto top = AtomicGet(Stack))
             if (AtomicCas(&Stack, top->Next, top)) {
-                top->Data = static_cast<ElementType&&>(element); 
-                AtomicSet(top->Next, nullptr); 
-                return top; 
-            } 
- 
-        return TBase::NewEntry(static_cast<ElementType&&>(element)); 
-    } 
- 
+                top->Data = static_cast<ElementType&&>(element);
+                AtomicSet(top->Next, nullptr);
+                return top;
+            }
+
+        return TBase::NewEntry(static_cast<ElementType&&>(element));
+    }
+
     virtual typename TBase::TEntry* DeleteEntry(typename TBase::TEntry* entry) noexcept override {
-        entry->Data = ElementType(); 
-        const auto next = entry->Next; 
+        entry->Data = ElementType();
+        const auto next = entry->Next;
         do
             AtomicSet(entry->Next, AtomicGet(Stack));
         while (!AtomicCas(&Stack, entry, entry->Next));
-        return next; 
-    } 
-}; 
- 
+        return next;
+    }
+};
+
 template <typename ElementType, template <typename T> class TQueueType = TFunnelQueue>
 class TCountedFunnelQueue: public TQueueType<ElementType> {
-public: 
-    TCountedFunnelQueue() noexcept 
-        : Count(0) 
+public:
+    TCountedFunnelQueue() noexcept
+        : Count(0)
     {
     }
- 
+
     TAtomicBase GetSize() const noexcept {
-        return AtomicGet(Count); 
-    } 
- 
-private: 
+        return AtomicGet(Count);
+    }
+
+private:
     typedef TQueueType<ElementType> TBase;
- 
+
     virtual typename TBase::TEntry* NewEntry(ElementType&& element) noexcept override {
-        AtomicAdd(Count, 1); 
-        return TBase::NewEntry(static_cast<ElementType&&>(element)); 
-    } 
- 
+        AtomicAdd(Count, 1);
+        return TBase::NewEntry(static_cast<ElementType&&>(element));
+    }
+
     virtual typename TBase::TEntry* DeleteEntry(typename TBase::TEntry* entry) noexcept override {
-        AtomicSub(Count, 1); 
-        return TBase::DeleteEntry(entry); 
-    } 
- 
-    TAtomic Count; 
-}; 
+        AtomicSub(Count, 1);
+        return TBase::DeleteEntry(entry);
+    }
+
+    TAtomic Count;
+};
diff --git a/library/cpp/binsaver/bin_saver.h b/library/cpp/binsaver/bin_saver.h
index baf8abfe55..412424889f 100644
--- a/library/cpp/binsaver/bin_saver.h
+++ b/library/cpp/binsaver/bin_saver.h
@@ -147,7 +147,7 @@ private:
             TVector<typename AM::key_type, typename std::allocator_traits<typename AM::allocator_type>::template rebind_alloc<typename AM::key_type>> indices;
             indices.resize(nSize);
             TStoredSize i = 1;
-            for (auto pos = data.begin(); pos != data.end(); ++pos, ++i) 
+            for (auto pos = data.begin(); pos != data.end(); ++pos, ++i)
                 indices[nSize - i] = pos->first;
             for (TStoredSize j = 0; j < nSize; ++j)
                 Add(1, &indices[j]);
@@ -155,7 +155,7 @@ private:
                 Add(2, &data[indices[j]]);
         }
     }
- 
+
     // hash_multimap
     template <class AMM>
     void DoAnyMultiMap(AMM& data) {
@@ -168,7 +168,7 @@ private:
             for (TStoredSize i = 0; i < nSize; ++i)
                 Add(1, &indices[i]);
             for (TStoredSize i = 0; i < nSize; ++i) {
-                std::pair<typename AMM::key_type, typename AMM::mapped_type> valToInsert; 
+                std::pair<typename AMM::key_type, typename AMM::mapped_type> valToInsert;
                 valToInsert.first = indices[i];
                 Add(2, &valToInsert.second);
                 data.insert(valToInsert);
@@ -177,9 +177,9 @@ private:
             TStoredSize nSize = data.size();
             CheckOverflow(nSize, data.size());
             Add(3, &nSize);
-            for (auto pos = data.begin(); pos != data.end(); ++pos) 
+            for (auto pos = data.begin(); pos != data.end(); ++pos)
                 Add(1, (typename AMM::key_type*)(&pos->first));
-            for (auto pos = data.begin(); pos != data.end(); ++pos) 
+            for (auto pos = data.begin(); pos != data.end(); ++pos)
                 Add(2, &pos->second);
         }
     }
@@ -345,27 +345,27 @@ public:
 
     template <class T1, class T2, class T3, class T4>
     int Add(const chunk_id, TMap<T1, T2, T3, T4>* pMap) {
-        DoAnyMap(*pMap); 
+        DoAnyMap(*pMap);
         return 0;
     }
     template <class T1, class T2, class T3, class T4, class T5>
     int Add(const chunk_id, THashMap<T1, T2, T3, T4, T5>* pHash) {
-        DoAnyMap(*pHash); 
+        DoAnyMap(*pHash);
         return 0;
     }
     template <class T1, class T2, class T3, class T4, class T5>
     int Add(const chunk_id, THashMultiMap<T1, T2, T3, T4, T5>* pHash) {
-        DoAnyMultiMap(*pHash); 
+        DoAnyMultiMap(*pHash);
         return 0;
     }
     template <class K, class L, class A>
     int Add(const chunk_id, TSet<K, L, A>* pSet) {
-        DoAnySet(*pSet); 
+        DoAnySet(*pSet);
         return 0;
     }
     template <class T1, class T2, class T3, class T4>
     int Add(const chunk_id, THashSet<T1, T2, T3, T4>* pHash) {
-        DoAnySet(*pHash); 
+        DoAnySet(*pHash);
         return 0;
     }
 
diff --git a/library/cpp/containers/comptrie/comptrie_trie.h b/library/cpp/containers/comptrie/comptrie_trie.h
index d47aa35587..40ec1e52b3 100644
--- a/library/cpp/containers/comptrie/comptrie_trie.h
+++ b/library/cpp/containers/comptrie/comptrie_trie.h
@@ -279,9 +279,9 @@ TCompactTrie<T, D, S>& TCompactTrie<T, D, S>::operator=(const TCompactTrie& othe
 template <class T, class D, class S>
 TCompactTrie<T, D, S>& TCompactTrie<T, D, S>::operator=(TCompactTrie&& other) noexcept {
     if (this != &other) {
-        DataHolder = std::move(other.DataHolder); 
-        EmptyValue = std::move(other.EmptyValue); 
-        Packer = std::move(other.Packer); 
+        DataHolder = std::move(other.DataHolder);
+        EmptyValue = std::move(other.EmptyValue);
+        Packer = std::move(other.Packer);
     }
     return *this;
 }
diff --git a/library/cpp/containers/comptrie/comptrie_ut.cpp b/library/cpp/containers/comptrie/comptrie_ut.cpp
index cf29b48960..74bee09b5d 100644
--- a/library/cpp/containers/comptrie/comptrie_ut.cpp
+++ b/library/cpp/containers/comptrie/comptrie_ut.cpp
@@ -1385,7 +1385,7 @@ void TCompactTrieTest::TestCopyAndAssignment() {
     TTrie assign;
     assign = trie;
     UNIT_ASSERT(assign.HasCorrectSkipper());
-    TTrie move(std::move(trie)); 
+    TTrie move(std::move(trie));
     UNIT_ASSERT(move.HasCorrectSkipper());
     TTrie moveAssign;
     moveAssign = TTrie(bufout.Buffer().Data(), bufout.Buffer().Size());
diff --git a/library/cpp/dbg_output/dump.h b/library/cpp/dbg_output/dump.h
index 96fddc21e3..c7efa105ee 100644
--- a/library/cpp/dbg_output/dump.h
+++ b/library/cpp/dbg_output/dump.h
@@ -8,7 +8,7 @@
 #include <util/stream/format.h>
 #include <util/system/type_name.h>
 #include <util/generic/hash_set.h>
-#include <utility> 
+#include <utility>
 
 /*
  * Cout << DbgDump(any) << Endl;
@@ -24,7 +24,7 @@ namespace NPrivate {
         struct TDump: public TDumpBase, public TColorSchemeContainer<TColorScheme> {
             template <typename... Args>
             inline TDump(Args&&... args)
-                : TDumpBase(std::forward<Args>(args)...) 
+                : TDumpBase(std::forward<Args>(args)...)
             {
             }
 
@@ -44,7 +44,7 @@ namespace NPrivate {
         struct TDump: public TDumpBase, public TColorSchemeContainer<TColorScheme> {
             template <typename... Args>
             inline TDump(Args&&... args)
-                : TDumpBase(std::forward<Args>(args)...) 
+                : TDumpBase(std::forward<Args>(args)...)
             {
             }
 
diff --git a/library/cpp/dbg_output/engine.h b/library/cpp/dbg_output/engine.h
index 809361ef80..f13c728c39 100644
--- a/library/cpp/dbg_output/engine.h
+++ b/library/cpp/dbg_output/engine.h
@@ -2,7 +2,7 @@
 
 #include <util/stream/output.h>
 
-#include <utility> 
+#include <utility>
 #include <util/generic/strbuf.h>
 
 template <class T>
@@ -23,7 +23,7 @@ namespace NDumpPrivate {
     inline T&& operator<<(T&& t, V&& v) {
         Dump(t, v);
 
-        return std::forward<T>(t); 
+        return std::forward<T>(t);
     }
 
     struct TADLBase {
diff --git a/library/cpp/digest/crc32c/crc32c.cpp b/library/cpp/digest/crc32c/crc32c.cpp
index d9e56ec006..369b46a213 100644
--- a/library/cpp/digest/crc32c/crc32c.cpp
+++ b/library/cpp/digest/crc32c/crc32c.cpp
@@ -1,35 +1,35 @@
-#include "crc32c.h" 
+#include "crc32c.h"
+
+#include <util/generic/singleton.h>
+
+#include <contrib/libs/crcutil/interface.h>
 
-#include <util/generic/singleton.h> 
- 
-#include <contrib/libs/crcutil/interface.h> 
- 
 namespace {
     typedef crcutil_interface::CRC TCrc;
 
     struct TCrcUtilSse4 {
         TCrc* const Pimpl;
- 
-        TCrcUtilSse4() noexcept 
+
+        TCrcUtilSse4() noexcept
             : Pimpl(TCrc::Create(0x82f63b78, 0, 32, true, 0, 0, 0, TCrc::IsSSE42Available(), nullptr))
         {
         }
- 
+
         ~TCrcUtilSse4() noexcept {
             Pimpl->Delete();
         }
- 
+
         inline ui32 Extend(ui32 init, const void* data, size_t n) const noexcept {
             crcutil_interface::UINT64 sum = init;
             Pimpl->Compute(data, n, &sum);
             return (ui32)sum;
         }
-    }; 
+    };
 }
- 
+
 ui32 Crc32c(const void* p, size_t size) noexcept {
     return Singleton<TCrcUtilSse4>()->Extend(0, p, size);
-} 
+}
 
 ui32 Crc32cExtend(ui32 init, const void* data, size_t n) noexcept {
     return Singleton<TCrcUtilSse4>()->Extend(init, data, n);
diff --git a/library/cpp/digest/crc32c/crc32c.h b/library/cpp/digest/crc32c/crc32c.h
index 054f65dd83..17b554c8e1 100644
--- a/library/cpp/digest/crc32c/crc32c.h
+++ b/library/cpp/digest/crc32c/crc32c.h
@@ -1,8 +1,8 @@
-#pragma once 
- 
+#pragma once
+
 #include <util/system/types.h>
- 
-// Threadsafe 
+
+// Threadsafe
 ui32 Crc32c(const void* p, size_t size) noexcept;
 ui32 Crc32cExtend(ui32 init, const void* data, size_t n) noexcept;
 
diff --git a/library/cpp/digest/crc32c/ya.make b/library/cpp/digest/crc32c/ya.make
index d07f0a8e75..d6faf16c9c 100644
--- a/library/cpp/digest/crc32c/ya.make
+++ b/library/cpp/digest/crc32c/ya.make
@@ -16,7 +16,7 @@ PEERDIR(
 )
 
 SRCS(
-    crc32c.cpp 
+    crc32c.cpp
 )
 
 END()
diff --git a/library/cpp/lfalloc/yt/ya.make b/library/cpp/lfalloc/yt/ya.make
index 4deeac71ef..8c1a4f8a72 100644
--- a/library/cpp/lfalloc/yt/ya.make
+++ b/library/cpp/lfalloc/yt/ya.make
@@ -1,6 +1,6 @@
 LIBRARY()
 
-OWNER(a-romanov) 
+OWNER(a-romanov)
 
 NO_UTIL()
 
@@ -14,9 +14,9 @@ ELSE()
     IF ("${YMAKE}" MATCHES "devtools")
         CFLAGS(-DYMAKE=1)
     ENDIF()
-    CXXFLAGS(-DLFALLOC_YT) 
+    CXXFLAGS(-DLFALLOC_YT)
     SRCS(
-        ../lf_allocX64.cpp 
+        ../lf_allocX64.cpp
     )
 ENDIF()
 
diff --git a/library/cpp/linear_regression/linear_regression.cpp b/library/cpp/linear_regression/linear_regression.cpp
index 6cbbef6f56..150f9d214e 100644
--- a/library/cpp/linear_regression/linear_regression.cpp
+++ b/library/cpp/linear_regression/linear_regression.cpp
@@ -9,7 +9,7 @@
 #endif
 
 #include <algorithm>
-#include <functional> 
+#include <functional>
 
 namespace {
     inline void AddFeaturesProduct(const double weight, const TVector<double>& features, TVector<double>& linearizedOLSTriangleMatrix);
@@ -122,7 +122,7 @@ TLinearModel TFastLinearRegressionSolver::Solve() const {
         coefficients.pop_back();
     }
 
-    return TLinearModel(std::move(coefficients), intercept); 
+    return TLinearModel(std::move(coefficients), intercept);
 }
 
 TLinearModel TLinearRegressionSolver::Solve() const {
@@ -134,7 +134,7 @@ TLinearModel TLinearRegressionSolver::Solve() const {
         intercept -= FeatureMeans[featureNumber] * coefficients[featureNumber];
     }
 
-    return TLinearModel(std::move(coefficients), intercept); 
+    return TLinearModel(std::move(coefficients), intercept);
 }
 
 double TFastLinearRegressionSolver::SumSquaredErrors() const {
diff --git a/library/cpp/linear_regression/linear_regression.h b/library/cpp/linear_regression/linear_regression.h
index 85da62e6dd..e57de5ff6c 100644
--- a/library/cpp/linear_regression/linear_regression.h
+++ b/library/cpp/linear_regression/linear_regression.h
@@ -206,7 +206,7 @@ public:
             bestSolver->Solve(coefficients[bestSolver - SLRSolvers.begin()], intercept, regularizationParameter);
         }
 
-        TLinearModel model(std::move(coefficients), intercept); 
+        TLinearModel model(std::move(coefficients), intercept);
         return model;
     }
 
diff --git a/library/cpp/logger/element.cpp b/library/cpp/logger/element.cpp
index f4114f53cc..b510fe16e1 100644
--- a/library/cpp/logger/element.cpp
+++ b/library/cpp/logger/element.cpp
@@ -1,7 +1,7 @@
 #include "log.h"
 #include "element.h"
 
-#include <utility> 
+#include <utility>
 
 TLogElement::TLogElement(const TLog* parent)
     : Parent_(parent)
diff --git a/library/cpp/logger/element_ut.cpp b/library/cpp/logger/element_ut.cpp
index 730a0cef48..32edc52dfb 100644
--- a/library/cpp/logger/element_ut.cpp
+++ b/library/cpp/logger/element_ut.cpp
@@ -5,7 +5,7 @@
 #include <util/generic/string.h>
 #include <util/stream/str.h>
 #include <util/generic/ptr.h>
-#include <utility> 
+#include <utility>
 
 #include <library/cpp/testing/unittest/registar.h>
 
diff --git a/library/cpp/messagebus/async_result.h b/library/cpp/messagebus/async_result.h
index 1aaa6b26ff..d24dde284a 100644
--- a/library/cpp/messagebus/async_result.h
+++ b/library/cpp/messagebus/async_result.h
@@ -5,8 +5,8 @@
 #include <util/system/condvar.h>
 #include <util/system/mutex.h>
 #include <util/system/yassert.h>
- 
-#include <functional> 
+
+#include <functional>
 
 // probably this thing should have been called TFuture
 template <typename T>
@@ -19,7 +19,7 @@ private:
 
     typedef void TOnResult(const T&);
 
-    std::function<TOnResult> OnResult; 
+    std::function<TOnResult> OnResult;
 
 public:
     void SetResult(const T& result) {
@@ -48,7 +48,7 @@ public:
             onResult(*Result);
         } else {
             Y_ASSERT(!OnResult);
-            OnResult = std::function<TOnResult>(onResult); 
+            OnResult = std::function<TOnResult>(onResult);
         }
     }
 };
diff --git a/library/cpp/messagebus/async_result_ut.cpp b/library/cpp/messagebus/async_result_ut.cpp
index 8ef034ef1d..2e96492afd 100644
--- a/library/cpp/messagebus/async_result_ut.cpp
+++ b/library/cpp/messagebus/async_result_ut.cpp
@@ -18,7 +18,7 @@ Y_UNIT_TEST_SUITE(TAsyncResult) {
 
         r.SetResult(17);
 
-        r.AndThen(std::bind(&SetValue, &var, std::placeholders::_1)); 
+        r.AndThen(std::bind(&SetValue, &var, std::placeholders::_1));
 
         UNIT_ASSERT_VALUES_EQUAL(17, var);
     }
@@ -28,7 +28,7 @@ Y_UNIT_TEST_SUITE(TAsyncResult) {
 
         int var = 1;
 
-        r.AndThen(std::bind(&SetValue, &var, std::placeholders::_1)); 
+        r.AndThen(std::bind(&SetValue, &var, std::placeholders::_1));
 
         r.SetResult(17);
 
diff --git a/library/cpp/messagebus/session_impl.cpp b/library/cpp/messagebus/session_impl.cpp
index 7b2e4f519e..ddf9f360c4 100644
--- a/library/cpp/messagebus/session_impl.cpp
+++ b/library/cpp/messagebus/session_impl.cpp
@@ -110,7 +110,7 @@ TBusSessionImpl::TBusSessionImpl(bool isSource, TBusMessageQueue* queue, TBusPro
 {
     Impl->DeadAcceptorStatusSummary.Summary = true;
 
-    ReadEventLoopThread.Reset(new NThreading::TLegacyFuture<void, false>(std::bind(&TEventLoop::Run, std::ref(ReadEventLoop)))); 
+    ReadEventLoopThread.Reset(new NThreading::TLegacyFuture<void, false>(std::bind(&TEventLoop::Run, std::ref(ReadEventLoop))));
     WriteEventLoopThread.Reset(new NThreading::TLegacyFuture<void, false>(std::bind(&TEventLoop::Run, std::ref(WriteEventLoop))));
 
     Queue->Schedule(IScheduleItemAutoPtr(new TScheduleSession(this, TInstant::Now() + Config.Secret.TimeoutPeriod)));
@@ -442,7 +442,7 @@ void TBusSessionImpl::Act(TStatusTag) {
 
     EShutdownState shutdownState = StatusData.ShutdownState.State.Get();
 
-    StatusData.ConnectionsAcceptorsSnapshotsQueue.DequeueAllLikelyEmpty(std::bind(&TBusSessionImpl::ProcessConnectionsAcceptorsShapshotQueueItem, this, std::placeholders::_1)); 
+    StatusData.ConnectionsAcceptorsSnapshotsQueue.DequeueAllLikelyEmpty(std::bind(&TBusSessionImpl::ProcessConnectionsAcceptorsShapshotQueueItem, this, std::placeholders::_1));
 
     GetDeadConnectionWriterStatusQueue()->DequeueAllLikelyEmpty();
     GetDeadConnectionReaderStatusQueue()->DequeueAllLikelyEmpty();
diff --git a/library/cpp/messagebus/test/perftest/perftest.cpp b/library/cpp/messagebus/test/perftest/perftest.cpp
index 2b3b9d2f05..8489319278 100644
--- a/library/cpp/messagebus/test/perftest/perftest.cpp
+++ b/library/cpp/messagebus/test/perftest/perftest.cpp
@@ -658,12 +658,12 @@ int main(int argc, char* argv[]) {
         for (int i = 0; i < TheConfig->ClientCount; ++i) {
             TGuard<TMutex> guard(ClientsLock);
             Clients.push_back(new TPerftestClient);
-            futures.push_back(new NThreading::TLegacyFuture<void, false>(std::bind(&TPerftestClient::Work, Clients.back()))); 
+            futures.push_back(new NThreading::TLegacyFuture<void, false>(std::bind(&TPerftestClient::Work, Clients.back())));
             www->RegisterClientSession(Clients.back()->Session);
         }
     }
 
-    futures.push_back(new NThreading::TLegacyFuture<void, false>(std::bind(&TTestStats::PeriodicallyPrint, std::ref(Stats)))); 
+    futures.push_back(new NThreading::TLegacyFuture<void, false>(std::bind(&TTestStats::PeriodicallyPrint, std::ref(Stats))));
 
     THolder<TBusWwwHttpServer> wwwServer;
     if (TheConfig->WwwPort != 0) {
diff --git a/library/cpp/monlib/counters/counters.h b/library/cpp/monlib/counters/counters.h
index 70985948f9..038b55f0c8 100644
--- a/library/cpp/monlib/counters/counters.h
+++ b/library/cpp/monlib/counters/counters.h
@@ -55,7 +55,7 @@ namespace NMonitoring {
         bool ForDerivative() const {
             return Derivative;
         }
- 
+
         operator TValueBase() const {
             return AtomicGet(Value);
         }
diff --git a/library/cpp/monlib/dynamic_counters/counters.cpp b/library/cpp/monlib/dynamic_counters/counters.cpp
index 08eb6faa13..3635d87d0d 100644
--- a/library/cpp/monlib/dynamic_counters/counters.cpp
+++ b/library/cpp/monlib/dynamic_counters/counters.cpp
@@ -157,8 +157,8 @@ void TDynamicCounters::MergeWithSubgroup(const TString& name, const TString& val
     Counters.erase(it);
     Counters.merge(subgroup->Resign());
     AtomicAdd(ExpiringCount, AtomicSwap(&subgroup->ExpiringCount, 0));
-} 
- 
+}
+
 void TDynamicCounters::ResetCounters(bool derivOnly) {
     TReadGuard g(Lock);
     for (auto& [key, value] : Counters) {
@@ -198,7 +198,7 @@ void TDynamicCounters::EnumerateSubgroups(const std::function<void(const TString
             output(key.LabelName, key.LabelValue);
         }
     }
-} 
+}
 
 void TDynamicCounters::OutputPlainText(IOutputStream& os, const TString& indent) const {
     auto snap = ReadSnapshot();
@@ -206,7 +206,7 @@ void TDynamicCounters::OutputPlainText(IOutputStream& os, const TString& indent)
     auto outputVisibilityMarker = [] (EVisibility vis) {
         return vis == EVisibility::Private ? "\t[PRIVATE]" : "";
     };
- 
+
     for (const auto& [key, value] : snap) {
         if (const auto counter = AsCounter(value)) {
             os << indent
diff --git a/library/cpp/monlib/dynamic_counters/counters.h b/library/cpp/monlib/dynamic_counters/counters.h
index fd8f530854..dc178cfbe0 100644
--- a/library/cpp/monlib/dynamic_counters/counters.h
+++ b/library/cpp/monlib/dynamic_counters/counters.h
@@ -12,7 +12,7 @@
 #include <util/string/cast.h>
 #include <util/system/rwlock.h>
 
-#include <functional> 
+#include <functional>
 
 namespace NMonitoring {
     struct TCounterForPtr;
@@ -333,7 +333,7 @@ namespace NMonitoring {
         TIntrusivePtr<TDynamicCounters> FindSubgroup(const TString& name, const TString& value) const;
         void RemoveSubgroup(const TString& name, const TString& value);
         void ReplaceSubgroup(const TString& name, const TString& value, TIntrusivePtr<TDynamicCounters> subgroup);
- 
+
         // Move all counters from specified subgroup and remove the subgroup.
         void MergeWithSubgroup(const TString& name, const TString& value);
         // Recursively reset all/deriv counters to 0.
diff --git a/library/cpp/monlib/dynamic_counters/page.cpp b/library/cpp/monlib/dynamic_counters/page.cpp
index 0dc63f149e..5124a47bb3 100644
--- a/library/cpp/monlib/dynamic_counters/page.cpp
+++ b/library/cpp/monlib/dynamic_counters/page.cpp
@@ -5,15 +5,15 @@
 #include <library/cpp/string_utils/quote/quote.h>
 
 #include <util/string/split.h>
-#include <util/system/tls.h> 
+#include <util/system/tls.h>
 
 using namespace NMonitoring;
 
 namespace {
     Y_POD_STATIC_THREAD(TDynamicCounters*)
     currentCounters(nullptr);
-} 
- 
+}
+
 TMaybe<EFormat> ParseFormat(TStringBuf str) {
     if (str == TStringBuf("json")) {
         return EFormat::JSON;
@@ -40,38 +40,38 @@ void TDynamicCountersPage::Output(NMonitoring::IMonHttpRequest& request) {
         .Split('/')
         .SkipEmpty()
         .Collect(&parts);
- 
+
     TMaybe<EFormat> format = !parts.empty() ? ParseFormat(parts.back()) : Nothing();
     if (format) {
-        parts.pop_back(); 
+        parts.pop_back();
     }
- 
+
     if (!parts.empty() && parts.back() == TStringBuf("private")) {
         visibility = TCountableBase::EVisibility::Private;
         parts.pop_back();
     }
 
-    auto counters = Counters; 
- 
+    auto counters = Counters;
+
     for (const auto& escaped : parts) {
         const auto part = CGIUnescapeRet(escaped);
 
         TVector<TString> labels;
         StringSplitter(part).Split('=').SkipEmpty().Collect(&labels);
- 
-        if (labels.size() != 2U) 
-            return NotFound(request); 
- 
+
+        if (labels.size() != 2U)
+            return NotFound(request);
+
         if (const auto child = counters->FindSubgroup(
                 labels.front(),
                 labels.back())) {
 
-            counters = child; 
+            counters = child;
         } else {
             return HandleAbsentSubgroup(request);
         }
-    } 
- 
+    }
+
     if (!format) {
         currentCounters = counters.Get();
         THtmlMonPage::Output(request);
@@ -94,7 +94,7 @@ void TDynamicCountersPage::Output(NMonitoring::IMonHttpRequest& request) {
     counters->Accept(TString(), TString(), *encoder);
     out.Flush();
 }
- 
+
 void TDynamicCountersPage::HandleAbsentSubgroup(IMonHttpRequest& request) {
     if (UnknownGroupPolicy == EUnknownGroupPolicy::Error) {
         NotFound(request);
@@ -112,7 +112,7 @@ void TDynamicCountersPage::BeforePre(IMonHttpRequest& request) {
             out << "<a href='" << request.GetPath() << "/json'>Counters as JSON</a>";
             out << " for <a href='https://wiki.yandex-team.ru/solomon/'>Solomon</a>";
         }
- 
+
         H5() {
             out << "Counters subgroups";
         }
@@ -125,15 +125,15 @@ void TDynamicCountersPage::BeforePre(IMonHttpRequest& request) {
                 }
             });
         }
- 
+
         H4() {
             out << "Counters as text";
         }
     }
-} 
+}
 
 void TDynamicCountersPage::OutputText(IOutputStream& out, IMonHttpRequest&) {
-    currentCounters->OutputPlainText(out); 
+    currentCounters->OutputPlainText(out);
 }
 
 void TDynamicCountersPage::SetUnknownGroupPolicy(EUnknownGroupPolicy value) {
diff --git a/library/cpp/monlib/dynamic_counters/page.h b/library/cpp/monlib/dynamic_counters/page.h
index 61ae703907..1f0ef6a5ea 100644
--- a/library/cpp/monlib/dynamic_counters/page.h
+++ b/library/cpp/monlib/dynamic_counters/page.h
@@ -19,7 +19,7 @@ namespace NMonitoring {
         using TOutputCallback = std::function<void()>;
 
     private:
-        const TIntrusivePtr<TDynamicCounters> Counters; 
+        const TIntrusivePtr<TDynamicCounters> Counters;
         TOutputCallback OutputCallback;
         EUnknownGroupPolicy UnknownGroupPolicy {EUnknownGroupPolicy::Error};
 
@@ -40,11 +40,11 @@ namespace NMonitoring {
         void Output(NMonitoring::IMonHttpRequest& request) override;
 
         void BeforePre(NMonitoring::IMonHttpRequest& request) override;
- 
+
         void OutputText(IOutputStream& out, NMonitoring::IMonHttpRequest&) override;
 
         /// If set to Error, responds with 404 if the requested subgroup is not found. This is the default.
         /// If set to Ignore, responds with 204 if the requested subgroup is not found
         void SetUnknownGroupPolicy(EUnknownGroupPolicy value);
-    }; 
+    };
 }
diff --git a/library/cpp/monlib/service/monservice.h b/library/cpp/monlib/service/monservice.h
index 543a07d143..8f5e52fcdb 100644
--- a/library/cpp/monlib/service/monservice.h
+++ b/library/cpp/monlib/service/monservice.h
@@ -9,7 +9,7 @@
 
 #include <util/system/progname.h>
 
-#include <functional> 
+#include <functional>
 
 namespace NMonitoring {
     class TMonService2: public TMtHttpServer {
diff --git a/library/cpp/monlib/service/pages/html_mon_page.cpp b/library/cpp/monlib/service/pages/html_mon_page.cpp
index 5dc9eed1fd..eb4eb3b66c 100644
--- a/library/cpp/monlib/service/pages/html_mon_page.cpp
+++ b/library/cpp/monlib/service/pages/html_mon_page.cpp
@@ -46,12 +46,12 @@ void THtmlMonPage::Output(NMonitoring::IMonHttpRequest& request) {
         }
     }
 }
- 
+
 void THtmlMonPage::NotFound(NMonitoring::IMonHttpRequest& request) const {
     IOutputStream& out = request.Output();
-    out << HTTPNOTFOUND; 
-    out.Flush(); 
-} 
+    out << HTTPNOTFOUND;
+    out.Flush();
+}
 
 void THtmlMonPage::NoContent(NMonitoring::IMonHttpRequest& request) const {
     IOutputStream& out = request.Output();
diff --git a/library/cpp/monlib/service/pages/html_mon_page.h b/library/cpp/monlib/service/pages/html_mon_page.h
index 07fc883f44..e87c53b62b 100644
--- a/library/cpp/monlib/service/pages/html_mon_page.h
+++ b/library/cpp/monlib/service/pages/html_mon_page.h
@@ -16,7 +16,7 @@ namespace NMonitoring {
 
         void NotFound(NMonitoring::IMonHttpRequest& request) const;
         void NoContent(NMonitoring::IMonHttpRequest& request) const;
- 
+
         virtual void OutputContent(NMonitoring::IMonHttpRequest& request) = 0;
 
         bool OutputTableSorterJsCss;
diff --git a/library/cpp/monlib/service/pages/templates.cpp b/library/cpp/monlib/service/pages/templates.cpp
index 132507f68b..ece12bea71 100644
--- a/library/cpp/monlib/service/pages/templates.cpp
+++ b/library/cpp/monlib/service/pages/templates.cpp
@@ -25,9 +25,9 @@ namespace NMonitoring {
     extern const char H6Tag[] = "h6";
     extern const char SmallTag[] = "small";
     extern const char StrongTag[] = "strong";
-    extern const char ListTag[] = "li"; 
-    extern const char UListTag[] = "ul"; 
-    extern const char OListTag[] = "ol"; 
+    extern const char ListTag[] = "li";
+    extern const char UListTag[] = "ul";
+    extern const char OListTag[] = "ol";
     extern const char DListTag[] = "dl";
     extern const char DTermTag[] = "dt";
     extern const char DDescTag[] = "dd";
diff --git a/library/cpp/monlib/service/pages/templates.h b/library/cpp/monlib/service/pages/templates.h
index f9240d968b..b4656f059f 100644
--- a/library/cpp/monlib/service/pages/templates.h
+++ b/library/cpp/monlib/service/pages/templates.h
@@ -70,7 +70,7 @@
 
 #define SMALL() TAG(TSMALL)
 #define STRONG() TAG(TSTRONG)
- 
+
 #define LI() TAG(TLIST)
 #define LI_CLASS(cls) TAG_CLASS(TLIST, cls)
 #define UL() TAG(TULIST)
@@ -259,9 +259,9 @@ namespace NMonitoring {
     typedef TTag<H6Tag> TH6;
     typedef TTag<SmallTag> TSMALL;
     typedef TTag<StrongTag> TSTRONG;
-    typedef TTag<ListTag> TLIST; 
-    typedef TTag<UListTag> TULIST; 
-    typedef TTag<OListTag> TOLIST; 
+    typedef TTag<ListTag> TLIST;
+    typedef TTag<UListTag> TULIST;
+    typedef TTag<OListTag> TOLIST;
     typedef TTag<DListTag> DLIST;
     typedef TTag<DTermTag> DTERM;
     typedef TTag<DDescTag> DDESC;
diff --git a/library/cpp/monlib/service/service.cpp b/library/cpp/monlib/service/service.cpp
index 8142d16cff..929efbf816 100644
--- a/library/cpp/monlib/service/service.cpp
+++ b/library/cpp/monlib/service/service.cpp
@@ -242,7 +242,7 @@ namespace NMonitoring {
     TMonService::TMonService(TContExecutor& executor, TIpPort internalPort, TIpPort externalPort,
                              THandler coHandler, THandler mtHandler)
         : CoServer(executor, "127.0.0.1", internalPort, std::move(coHandler))
-        , MtServer(THttpServerOptions(externalPort), std::bind(&TMonService::DispatchRequest, this, std::placeholders::_1, std::placeholders::_2)) 
+        , MtServer(THttpServerOptions(externalPort), std::bind(&TMonService::DispatchRequest, this, std::placeholders::_1, std::placeholders::_2))
         , MtHandler(std::move(mtHandler))
     {
     }
diff --git a/library/cpp/retry/retry.h b/library/cpp/retry/retry.h
index ad09008b69..c47ff5070f 100644
--- a/library/cpp/retry/retry.h
+++ b/library/cpp/retry/retry.h
@@ -8,7 +8,7 @@
 #include <util/generic/maybe.h>
 #include <util/generic/typetraits.h>
 #include <util/generic/yexception.h>
-#include <functional> 
+#include <functional>
 
 struct TRetryOptions {
     ui32 RetryCount;
diff --git a/library/cpp/scheme/scimpl_defs.h b/library/cpp/scheme/scimpl_defs.h
index 07589b88fb..f3dd66b437 100644
--- a/library/cpp/scheme/scimpl_defs.h
+++ b/library/cpp/scheme/scimpl_defs.h
@@ -12,7 +12,7 @@
 #include <util/generic/strbuf.h>
 #include <util/generic/string.h>
 #include <util/generic/vector.h>
-#include <functional> 
+#include <functional>
 #include <util/string/vector.h>
 #include <util/string/type.h>
 
diff --git a/library/cpp/scheme/scimpl_private.cpp b/library/cpp/scheme/scimpl_private.cpp
index ea404fa036..024bf8cc3b 100644
--- a/library/cpp/scheme/scimpl_private.cpp
+++ b/library/cpp/scheme/scimpl_private.cpp
@@ -1,7 +1,7 @@
 #include "scimpl_private.h"
 
 #include <util/generic/algorithm.h>
-#include <utility> 
+#include <utility>
 
 namespace NSc {
     namespace NImpl {
diff --git a/library/cpp/sighandler/async_signals_handler.cpp b/library/cpp/sighandler/async_signals_handler.cpp
index a6b1b7f088..00ce1c18fb 100644
--- a/library/cpp/sighandler/async_signals_handler.cpp
+++ b/library/cpp/sighandler/async_signals_handler.cpp
@@ -239,7 +239,7 @@ void SetAsyncSignalHandler(int signum, void (*handler)(int)) {
     SetAsyncSignalHandler(signum, new TFunctionEventHandler<void (*)(int)>(handler));
 }
 
-void SetAsyncSignalFunction(int signum, std::function<void(int)> func) { 
-    typedef std::function<void(int)> TFunc; 
+void SetAsyncSignalFunction(int signum, std::function<void(int)> func) {
+    typedef std::function<void(int)> TFunc;
     SetAsyncSignalHandler(signum, new TFunctionEventHandler<TFunc>(func));
 }
diff --git a/library/cpp/sighandler/async_signals_handler.h b/library/cpp/sighandler/async_signals_handler.h
index cee528d229..da36365ace 100644
--- a/library/cpp/sighandler/async_signals_handler.h
+++ b/library/cpp/sighandler/async_signals_handler.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <util/generic/ptr.h>
-#include <functional> 
+#include <functional>
 
 struct TEventHandler {
     virtual ~TEventHandler() {
@@ -11,4 +11,4 @@ struct TEventHandler {
 
 void SetAsyncSignalHandler(int signum, TAutoPtr<TEventHandler> handler);
 void SetAsyncSignalHandler(int signum, void (*handler)(int));
-void SetAsyncSignalFunction(int signum, std::function<void(int)> func); 
+void SetAsyncSignalFunction(int signum, std::function<void(int)> func);
diff --git a/library/cpp/threading/future/legacy_future.h b/library/cpp/threading/future/legacy_future.h
index ce257caa48..6f1eabad73 100644
--- a/library/cpp/threading/future/legacy_future.h
+++ b/library/cpp/threading/future/legacy_future.h
@@ -5,7 +5,7 @@
 
 #include <util/thread/factory.h>
 
-#include <functional> 
+#include <functional>
 
 namespace NThreading {
     template <typename TR, bool IgnoreException>
diff --git a/library/cpp/threading/local_executor/local_executor.h b/library/cpp/threading/local_executor/local_executor.h
index 5b8a3b1af9..c1c824f67c 100644
--- a/library/cpp/threading/local_executor/local_executor.h
+++ b/library/cpp/threading/local_executor/local_executor.h
@@ -9,7 +9,7 @@
 #include <util/generic/singleton.h>
 #include <util/generic/ymath.h>
 
-#include <functional> 
+#include <functional>
 
 namespace NPar {
     struct ILocallyExecutable : virtual public TThrRefBase {
diff --git a/library/cpp/threading/poor_man_openmp/thread_helper.h b/library/cpp/threading/poor_man_openmp/thread_helper.h
index a53727e088..0ecee0590b 100644
--- a/library/cpp/threading/poor_man_openmp/thread_helper.h
+++ b/library/cpp/threading/poor_man_openmp/thread_helper.h
@@ -45,7 +45,7 @@ namespace NYmp {
     }
 
     template <typename T>
-    inline void ParallelForStaticChunk(T begin, T end, size_t chunkSize, std::function<void(T)> func) { 
+    inline void ParallelForStaticChunk(T begin, T end, size_t chunkSize, std::function<void(T)> func) {
         chunkSize = Max<size_t>(chunkSize, 1);
 
         size_t threadCount = TMtpQueueHelper::Instance().GetThreadCount();
@@ -96,7 +96,7 @@ namespace NYmp {
     }
 
     template <typename T>
-    inline void ParallelForStaticAutoChunk(T begin, T end, std::function<void(T)> func) { 
+    inline void ParallelForStaticAutoChunk(T begin, T end, std::function<void(T)> func) {
         const size_t taskSize = end - begin;
         const size_t threadCount = TMtpQueueHelper::Instance().GetThreadCount();
 
diff --git a/library/cpp/threading/skip_list/perf/main.cpp b/library/cpp/threading/skip_list/perf/main.cpp
index 9b25574277..4ad52049e7 100644
--- a/library/cpp/threading/skip_list/perf/main.cpp
+++ b/library/cpp/threading/skip_list/perf/main.cpp
@@ -6,7 +6,7 @@
 #include <util/datetime/base.h>
 #include <util/generic/map.h>
 #include <util/generic/vector.h>
-#include <functional> 
+#include <functional>
 #include <util/memory/pool.h>
 #include <util/random/random.h>
 #include <util/string/join.h>
diff --git a/library/cpp/xml/document/xml-textreader.h b/library/cpp/xml/document/xml-textreader.h
index bed5fbe0c2..ab4c329d26 100644
--- a/library/cpp/xml/document/xml-textreader.h
+++ b/library/cpp/xml/document/xml-textreader.h
@@ -11,7 +11,7 @@
 #include <util/generic/ptr.h>
 #include <util/generic/strbuf.h>
 #include <util/generic/string.h>
-#include <functional> 
+#include <functional>
 #include <util/stream/input.h>
 #include <util/stream/str.h>
 
diff --git a/library/cpp/xml/document/xml-textreader_ut.cpp b/library/cpp/xml/document/xml-textreader_ut.cpp
index 0f1b553911..6232dfe47e 100644
--- a/library/cpp/xml/document/xml-textreader_ut.cpp
+++ b/library/cpp/xml/document/xml-textreader_ut.cpp
@@ -11,7 +11,7 @@ namespace {
      * Simple wrapper around the xmlTextReader wrapper
      */
     void ParseXml(const TString& xmlData,
-                  std::function<void(NXml::TConstNode)> nodeHandlerFunc, 
+                  std::function<void(NXml::TConstNode)> nodeHandlerFunc,
                   const TString& localName,
                   const TString& namespaceUri = TString()) {
         TStringInput in(xmlData);
diff --git a/library/cpp/yson/node/node_builder.cpp b/library/cpp/yson/node/node_builder.cpp
index 6bb2dcd832..b4431bc77a 100644
--- a/library/cpp/yson/node/node_builder.cpp
+++ b/library/cpp/yson/node/node_builder.cpp
@@ -86,7 +86,7 @@ void TNodeBuilder::OnNode(TNode node)
 
 void TNodeBuilder::AddNode(TNode value, bool pop)
 {
-    Stack_.top()->MoveWithoutAttributes(std::move(value)); 
+    Stack_.top()->MoveWithoutAttributes(std::move(value));
     if (pop)
         Stack_.pop();
 }
diff --git a/library/cpp/yson_pull/detail/reader.h b/library/cpp/yson_pull/detail/reader.h
index a26f18032a..0e02396358 100644
--- a/library/cpp/yson_pull/detail/reader.h
+++ b/library/cpp/yson_pull/detail/reader.h
@@ -657,12 +657,12 @@ namespace NYsonPull {
                         yield(lexer_.read_percent_scalar());
                         break;
 
-                    case char_class::none: 
-                        COLD_BLOCK_BYVALUE 
-                        lexer_.fail("Invalid yson value."); 
-                        COLD_BLOCK_END 
-                        break; 
- 
+                    case char_class::none:
+                        COLD_BLOCK_BYVALUE
+                        lexer_.fail("Invalid yson value.");
+                        COLD_BLOCK_END
+                        break;
+
                     default:
                         Y_UNREACHABLE();
                 }
diff --git a/library/cpp/yson_pull/ut/reader_ut.cpp b/library/cpp/yson_pull/ut/reader_ut.cpp
index 3cc83ae9fa..1184265ddb 100644
--- a/library/cpp/yson_pull/ut/reader_ut.cpp
+++ b/library/cpp/yson_pull/ut/reader_ut.cpp
@@ -348,8 +348,8 @@ Y_UNIT_TEST_SUITE(Reader) {
 
         REJECT("<a=b>");
         REJECT("<>");
- 
-        REJECT("@"); 
+
+        REJECT("@");
     }
 
     Y_UNIT_TEST(ReadPastEnd) {