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

33 files changed, 92 insertions, 92 deletions

diff --git a/library/cpp/protobuf/interop/cast.cpp b/library/cpp/protobuf/interop/cast.cpp
index 6036eb503b..c4cd59b417 100644
--- a/library/cpp/protobuf/interop/cast.cpp
+++ b/library/cpp/protobuf/interop/cast.cpp
@@ -1,4 +1,4 @@
-#include <library/cpp/protobuf/interop/cast.h> 
+#include <library/cpp/protobuf/interop/cast.h>
 
 #include <google/protobuf/duration.pb.h>
 #include <google/protobuf/timestamp.pb.h>
diff --git a/library/cpp/protobuf/interop/ut/cast_ut.cpp b/library/cpp/protobuf/interop/ut/cast_ut.cpp
index bab31ff3d3..6ef055b651 100644
--- a/library/cpp/protobuf/interop/ut/cast_ut.cpp
+++ b/library/cpp/protobuf/interop/ut/cast_ut.cpp
@@ -1,4 +1,4 @@
-#include <library/cpp/protobuf/interop/cast.h> 
+#include <library/cpp/protobuf/interop/cast.h>
 #include <library/cpp/testing/unittest/registar.h>
 
 #include <google/protobuf/duration.pb.h>
diff --git a/library/cpp/protobuf/interop/ut/ya.make b/library/cpp/protobuf/interop/ut/ya.make
index 49b2a34640..b9c634cb6b 100644
--- a/library/cpp/protobuf/interop/ut/ya.make
+++ b/library/cpp/protobuf/interop/ut/ya.make
@@ -1,4 +1,4 @@
-UNITTEST_FOR(library/cpp/protobuf/interop) 
+UNITTEST_FOR(library/cpp/protobuf/interop)
 
 OWNER(
     paxakor
@@ -9,7 +9,7 @@ SRCS(
 )
 
 PEERDIR(
-    library/cpp/protobuf/interop 
+    library/cpp/protobuf/interop
 )
 
 END()
diff --git a/library/cpp/protobuf/json/inline.h b/library/cpp/protobuf/json/inline.h
index bd62bb9635..e2d7bb6ef0 100644
--- a/library/cpp/protobuf/json/inline.h
+++ b/library/cpp/protobuf/json/inline.h
@@ -39,7 +39,7 @@
 #include "proto2json_printer.h"
 #include "json_output_create.h"
 
-#include <library/cpp/protobuf/util/simple_reflection.h> 
+#include <library/cpp/protobuf/util/simple_reflection.h>
 
 #include <util/generic/maybe.h>
 #include <util/generic/yexception.h>
diff --git a/library/cpp/protobuf/json/json2proto.cpp b/library/cpp/protobuf/json/json2proto.cpp
index 2284b6fb12..640c10f5a5 100644
--- a/library/cpp/protobuf/json/json2proto.cpp
+++ b/library/cpp/protobuf/json/json2proto.cpp
@@ -1,7 +1,7 @@
 #include "json2proto.h"
 #include "util.h"
 
-#include <library/cpp/json/json_value.h> 
+#include <library/cpp/json/json_value.h>
 
 #include <google/protobuf/message.h>
 #include <google/protobuf/descriptor.h>
diff --git a/library/cpp/protobuf/json/json2proto.h b/library/cpp/protobuf/json/json2proto.h
index 90f09eb53a..4c33498dfa 100644
--- a/library/cpp/protobuf/json/json2proto.h
+++ b/library/cpp/protobuf/json/json2proto.h
@@ -3,8 +3,8 @@
 #include "string_transform.h"
 #include "name_generator.h"
 
-#include <library/cpp/json/json_reader.h> 
-#include <library/cpp/json/json_value.h> 
+#include <library/cpp/json/json_reader.h>
+#include <library/cpp/json/json_value.h>
 
 #include <util/stream/input.h>
 #include <util/stream/str.h>
diff --git a/library/cpp/protobuf/json/json_value_output.cpp b/library/cpp/protobuf/json/json_value_output.cpp
index b74b37bb4f..d845cc1c74 100644
--- a/library/cpp/protobuf/json/json_value_output.cpp
+++ b/library/cpp/protobuf/json/json_value_output.cpp
@@ -1,6 +1,6 @@
 #include "json_value_output.h"
 
-#include <library/cpp/json/json_reader.h> 
+#include <library/cpp/json/json_reader.h>
 
 namespace NProtobufJson {
     template <typename T>
diff --git a/library/cpp/protobuf/json/json_value_output.h b/library/cpp/protobuf/json/json_value_output.h
index 73fe502ba8..3fc6ff2ab0 100644
--- a/library/cpp/protobuf/json/json_value_output.h
+++ b/library/cpp/protobuf/json/json_value_output.h
@@ -2,7 +2,7 @@
 
 #include "json_output.h"
 
-#include <library/cpp/json/writer/json_value.h> 
+#include <library/cpp/json/writer/json_value.h>
 
 #include <util/generic/stack.h>
 
diff --git a/library/cpp/protobuf/json/json_writer_output.h b/library/cpp/protobuf/json/json_writer_output.h
index d36fcb987d..3d8a2daa56 100644
--- a/library/cpp/protobuf/json/json_writer_output.h
+++ b/library/cpp/protobuf/json/json_writer_output.h
@@ -3,7 +3,7 @@
 #include "json_output.h"
 #include "config.h"
 
-#include <library/cpp/json/json_writer.h> 
+#include <library/cpp/json/json_writer.h>
 
 #include <util/string/builder.h>
 #include <util/generic/store_policy.h>
diff --git a/library/cpp/protobuf/json/proto2json.cpp b/library/cpp/protobuf/json/proto2json.cpp
index 4254968fea..3d76a91686 100644
--- a/library/cpp/protobuf/json/proto2json.cpp
+++ b/library/cpp/protobuf/json/proto2json.cpp
@@ -3,9 +3,9 @@
 #include "json_output_create.h"
 #include "proto2json_printer.h"
 
-#include <library/cpp/json/json_reader.h> 
-#include <library/cpp/json/json_value.h> 
-#include <library/cpp/json/json_writer.h> 
+#include <library/cpp/json/json_reader.h>
+#include <library/cpp/json/json_value.h>
+#include <library/cpp/json/json_writer.h>
 
 #include <util/generic/ptr.h>
 #include <util/generic/strbuf.h>
diff --git a/library/cpp/protobuf/json/ut/filter_ut.cpp b/library/cpp/protobuf/json/ut/filter_ut.cpp
index 9c8893dfae..95c227666f 100644
--- a/library/cpp/protobuf/json/ut/filter_ut.cpp
+++ b/library/cpp/protobuf/json/ut/filter_ut.cpp
@@ -1,8 +1,8 @@
-#include <library/cpp/protobuf/json/ut/filter_ut.pb.h> 
+#include <library/cpp/protobuf/json/ut/filter_ut.pb.h>
 
-#include <library/cpp/protobuf/json/filter.h> 
-#include <library/cpp/protobuf/json/field_option.h> 
-#include <library/cpp/protobuf/json/proto2json.h> 
+#include <library/cpp/protobuf/json/filter.h>
+#include <library/cpp/protobuf/json/field_option.h>
+#include <library/cpp/protobuf/json/proto2json.h>
 #include <library/cpp/testing/unittest/registar.h>
 
 using namespace NProtobufJson;
diff --git a/library/cpp/protobuf/json/ut/inline_ut.cpp b/library/cpp/protobuf/json/ut/inline_ut.cpp
index aabf79451d..c29ad32e7d 100644
--- a/library/cpp/protobuf/json/ut/inline_ut.cpp
+++ b/library/cpp/protobuf/json/ut/inline_ut.cpp
@@ -1,8 +1,8 @@
-#include <library/cpp/protobuf/json/ut/inline_ut.pb.h> 
+#include <library/cpp/protobuf/json/ut/inline_ut.pb.h>
 
-#include <library/cpp/protobuf/json/inline.h> 
-#include <library/cpp/protobuf/json/field_option.h> 
-#include <library/cpp/protobuf/json/proto2json.h> 
+#include <library/cpp/protobuf/json/inline.h>
+#include <library/cpp/protobuf/json/field_option.h>
+#include <library/cpp/protobuf/json/proto2json.h>
 #include <library/cpp/testing/unittest/registar.h>
 
 #include <util/generic/string.h>
diff --git a/library/cpp/protobuf/json/ut/json.h b/library/cpp/protobuf/json/ut/json.h
index fe54840999..c1f108e6e4 100644
--- a/library/cpp/protobuf/json/ut/json.h
+++ b/library/cpp/protobuf/json/ut/json.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <library/cpp/protobuf/json/ut/test.pb.h> 
+#include <library/cpp/protobuf/json/ut/test.pb.h>
 
-#include <library/cpp/json/json_value.h> 
+#include <library/cpp/json/json_value.h>
 
 #include <cstdarg>
 
diff --git a/library/cpp/protobuf/json/ut/json2proto_ut.cpp b/library/cpp/protobuf/json/ut/json2proto_ut.cpp
index 6fdbba4245..0dfe57bc7a 100644
--- a/library/cpp/protobuf/json/ut/json2proto_ut.cpp
+++ b/library/cpp/protobuf/json/ut/json2proto_ut.cpp
@@ -2,13 +2,13 @@
 #include "proto.h"
 #include "proto2json.h"
 
-#include <library/cpp/protobuf/json/ut/test.pb.h> 
+#include <library/cpp/protobuf/json/ut/test.pb.h>
 
-#include <library/cpp/json/json_value.h> 
-#include <library/cpp/json/json_reader.h> 
-#include <library/cpp/json/json_writer.h> 
+#include <library/cpp/json/json_value.h>
+#include <library/cpp/json/json_reader.h>
+#include <library/cpp/json/json_writer.h>
 
-#include <library/cpp/protobuf/json/json2proto.h> 
+#include <library/cpp/protobuf/json/json2proto.h>
 
 #include <library/cpp/testing/unittest/registar.h>
 
@@ -92,7 +92,7 @@ Y_UNIT_TEST_SUITE(TJson2ProtoTest) {
         FillFlatProto(&modelProto, skippedField);                     \
         UNIT_ASSERT_PROTOS_EQUAL(proto, modelProto);                  \
     }
-#include <library/cpp/protobuf/json/ut/fields.incl> 
+#include <library/cpp/protobuf/json/ut/fields.incl>
 #undef DEFINE_FIELD
 } // TestFlatOptional
 
@@ -114,7 +114,7 @@ UNIT_ASSERT_PROTOS_EQUAL(proto, modelProto);
         TFlatRequired proto;                                          \
         UNIT_ASSERT_EXCEPTION(Json2Proto(json, proto), yexception);   \
     }
-#include <library/cpp/protobuf/json/ut/fields.incl> 
+#include <library/cpp/protobuf/json/ut/fields.incl>
 #undef DEFINE_FIELD
 } // TestFlatRequired
 
@@ -153,7 +153,7 @@ Y_UNIT_TEST(TestFlatNoCheckRequired) {
         TFlatRequired proto;                                          \
         UNIT_ASSERT_NO_EXCEPTION(Json2Proto(json, proto, cfg));       \
     }
-#include <library/cpp/protobuf/json/ut/fields.incl> 
+#include <library/cpp/protobuf/json/ut/fields.incl>
 #undef DEFINE_FIELD
 } // TestFlatNoCheckRequired
 
@@ -178,7 +178,7 @@ UNIT_ASSERT_PROTOS_EQUAL(proto, modelProto);
         FillRepeatedProto(&modelProto, skippedField);                         \
         UNIT_ASSERT_PROTOS_EQUAL(proto, modelProto);                          \
     }
-#include <library/cpp/protobuf/json/ut/repeated_fields.incl> 
+#include <library/cpp/protobuf/json/ut/repeated_fields.incl>
 #undef DEFINE_REPEATED_FIELD
 } // TestFlatRepeated
 
@@ -203,7 +203,7 @@ UNIT_ASSERT_PROTOS_EQUAL(proto, modelProto);
         FillCompositeProto(&modelProto, skippedField);                     \
         UNIT_ASSERT_PROTOS_EQUAL(proto, modelProto);                       \
     }
-#include <library/cpp/protobuf/json/ut/fields.incl> 
+#include <library/cpp/protobuf/json/ut/fields.incl>
 #undef DEFINE_FIELD
 } // TestCompositeOptional
 
@@ -236,7 +236,7 @@ UNIT_ASSERT_PROTOS_EQUAL(proto, modelProto);
         }                                                           \
         UNIT_ASSERT_PROTOS_EQUAL(proto, modelProto);                \
     }
-#include <library/cpp/protobuf/json/ut/fields.incl> 
+#include <library/cpp/protobuf/json/ut/fields.incl>
 #undef DEFINE_FIELD
 } // TestCompositeOptionalStringBuf
 
@@ -289,7 +289,7 @@ Y_UNIT_TEST(TestCompositeRepeated) {
         modelProto.AddPart()->CopyFrom(partModelProto);  \
         array.AppendValue(CreateFlatJson(skippedField)); \
     }
-#include <library/cpp/protobuf/json/ut/repeated_fields.incl> 
+#include <library/cpp/protobuf/json/ut/repeated_fields.incl>
 #undef DEFINE_REPEATED_FIELD
 
         NJson::TJsonValue json;
@@ -462,7 +462,7 @@ Y_UNIT_TEST(TestFieldNameMode) {
     {
         // FIXME(CONTRIB-139): since protobuf 3.1, Def_upper json name is
         // "DefUpper", but until kernel/ugc/schema and yweb/yasap/pdb are
-        // updated, library/cpp/protobuf/json preserves compatibility with 
+        // updated, library/cpp/protobuf/json preserves compatibility with
         // protobuf 3.0 by lowercasing default names, making it "defUpper".
         TString modelStr(R"_({"My-Upper":1,"my-lower":2,"defUpper":3,"defLower":4})_");
 
@@ -591,7 +591,7 @@ Y_UNIT_TEST(TestCastFromString) {
         NJson::TJsonValue json;
 #define DEFINE_FIELD(name, value) \
     json.InsertValue(#name, ConvertToString(value));
-#include <library/cpp/protobuf/json/ut/fields.incl> 
+#include <library/cpp/protobuf/json/ut/fields.incl>
 #undef DEFINE_FIELD
 
         TFlatOptional proto;
@@ -618,7 +618,7 @@ Y_UNIT_TEST(TestCastFromString) {
         }                                                              \
         json.InsertValue(#name, array);                                \
     }
-#include <library/cpp/protobuf/json/ut/repeated_fields.incl> 
+#include <library/cpp/protobuf/json/ut/repeated_fields.incl>
 #undef DEFINE_REPEATED_FIELD
 
         TFlatRepeated proto;
@@ -676,7 +676,7 @@ Y_UNIT_TEST(TestVectorizeScalars) {
     NJson::TJsonValue json;
 #define DEFINE_FIELD(name, value) \
     json.InsertValue(#name, value);
-#include <library/cpp/protobuf/json/ut/fields.incl> 
+#include <library/cpp/protobuf/json/ut/fields.incl>
 #undef DEFINE_FIELD
 
     TFlatRepeated proto;
@@ -686,7 +686,7 @@ Y_UNIT_TEST(TestVectorizeScalars) {
 
 #define DEFINE_FIELD(name, value) \
     UNIT_ASSERT_VALUES_EQUAL(proto.Get ## name(0), value);
-#include <library/cpp/protobuf/json/ut/fields.incl> 
+#include <library/cpp/protobuf/json/ut/fields.incl>
 #undef DEFINE_FIELD
 }
 
diff --git a/library/cpp/protobuf/json/ut/proto.h b/library/cpp/protobuf/json/ut/proto.h
index 715a51116c..8183bfc8e1 100644
--- a/library/cpp/protobuf/json/ut/proto.h
+++ b/library/cpp/protobuf/json/ut/proto.h
@@ -13,7 +13,7 @@ namespace NProtobufJsonTest {
 #define DEFINE_FIELD(name, value)                         \
     if (skippedFields.find(#name) == skippedFields.end()) \
         proto->Set##name(value);
-#include <library/cpp/protobuf/json/ut/fields.incl> 
+#include <library/cpp/protobuf/json/ut/fields.incl>
 #undef DEFINE_FIELD
     }
 
@@ -38,7 +38,7 @@ namespace NProtobufJsonTest {
             AddValue(proto->Mutable##name(), values[i]);               \
         }                                                              \
     }
-#include <library/cpp/protobuf/json/ut/repeated_fields.incl> 
+#include <library/cpp/protobuf/json/ut/repeated_fields.incl>
 #undef DEFINE_REPEATED_FIELD
     }
 
diff --git a/library/cpp/protobuf/json/ut/proto2json_ut.cpp b/library/cpp/protobuf/json/ut/proto2json_ut.cpp
index 2fb81cf184..07e52d7f2f 100644
--- a/library/cpp/protobuf/json/ut/proto2json_ut.cpp
+++ b/library/cpp/protobuf/json/ut/proto2json_ut.cpp
@@ -1,13 +1,13 @@
 #include "json.h"
 #include "proto.h"
 
-#include <library/cpp/protobuf/json/ut/test.pb.h> 
+#include <library/cpp/protobuf/json/ut/test.pb.h>
 
-#include <library/cpp/json/json_value.h> 
-#include <library/cpp/json/json_reader.h> 
-#include <library/cpp/json/json_writer.h> 
+#include <library/cpp/json/json_value.h>
+#include <library/cpp/json/json_reader.h>
+#include <library/cpp/json/json_writer.h>
 
-#include <library/cpp/protobuf/json/proto2json.h> 
+#include <library/cpp/protobuf/json/proto2json.h>
 
 #include <library/cpp/testing/unittest/registar.h>
 
@@ -70,7 +70,7 @@ Y_UNIT_TEST_SUITE(TProto2JsonFlatTest) {
                 break;                                                                                \
         }                                                                                             \
     }
-#include <library/cpp/protobuf/json/ut/fields.incl> 
+#include <library/cpp/protobuf/json/ut/fields.incl>
 #undef DEFINE_FIELD
     }
 
@@ -137,7 +137,7 @@ Y_UNIT_TEST_SUITE(TProto2JsonFlatTest) {
             UNIT_ASSERT_JSONS_EQUAL(json, modelJson);                      \
         }                                                                  \
     }
-#include <library/cpp/protobuf/json/ut/fields.incl> 
+#include <library/cpp/protobuf/json/ut/fields.incl>
 #undef DEFINE_FIELD
 } // TestFlatOptional
 
@@ -178,7 +178,7 @@ const NJson::TJsonValue& modelJson = CreateFlatJson();
             UNIT_ASSERT_JSONS_EQUAL(json, modelJson);                      \
         }                                                                  \
     }
-#include <library/cpp/protobuf/json/ut/fields.incl> 
+#include <library/cpp/protobuf/json/ut/fields.incl>
 #undef DEFINE_FIELD
 } // TestFlatRequired
 
@@ -223,7 +223,7 @@ Y_UNIT_TEST(TestFlatRepeated) {
             UNIT_ASSERT_JSONS_EQUAL(json, modelJson);                              \
         }                                                                          \
     }
-#include <library/cpp/protobuf/json/ut/repeated_fields.incl> 
+#include <library/cpp/protobuf/json/ut/repeated_fields.incl>
 #undef DEFINE_REPEATED_FIELD
 } // TestFlatRepeated
 
@@ -264,7 +264,7 @@ const NJson::TJsonValue& modelJson = CreateCompositeJson();
             UNIT_ASSERT_JSONS_EQUAL(json, modelJson);                           \
         }                                                                       \
     }
-#include <library/cpp/protobuf/json/ut/fields.incl> 
+#include <library/cpp/protobuf/json/ut/fields.incl>
 #undef DEFINE_FIELD
 } // TestCompositeOptional
 
@@ -305,7 +305,7 @@ const NJson::TJsonValue& modelJson = CreateCompositeJson();
             UNIT_ASSERT_JSONS_EQUAL(json, modelJson);                           \
         }                                                                       \
     }
-#include <library/cpp/protobuf/json/ut/fields.incl> 
+#include <library/cpp/protobuf/json/ut/fields.incl>
 #undef DEFINE_FIELD
 } // TestCompositeRequired
 
@@ -349,7 +349,7 @@ Y_UNIT_TEST(TestCompositeRepeated) {
         proto.AddPart()->CopyFrom(partProto);                 \
         modelArray.AppendValue(CreateFlatJson(skippedField)); \
     }
-#include <library/cpp/protobuf/json/ut/repeated_fields.incl> 
+#include <library/cpp/protobuf/json/ut/repeated_fields.incl>
 #undef DEFINE_REPEATED_FIELD
 
         NJson::TJsonValue modelJson;
@@ -454,7 +454,7 @@ Y_UNIT_TEST(TestMissingSingleKeyConfig) {
         NJson::TJsonValue modelJson;
 #define DEFINE_FIELD(name, value) \
     modelJson.InsertValue(#name, NJson::TJsonValue(NJson::JSON_NULL));
-#include <library/cpp/protobuf/json/ut/fields.incl> 
+#include <library/cpp/protobuf/json/ut/fields.incl>
 #undef DEFINE_FIELD
 
         TFlatOptional proto;
@@ -540,7 +540,7 @@ Y_UNIT_TEST(TestMissingRepeatedKeyConfig) {
         NJson::TJsonValue modelJson;
 #define DEFINE_FIELD(name, value) \
     modelJson.InsertValue(#name, NJson::TJsonValue(NJson::JSON_NULL));
-#include <library/cpp/protobuf/json/ut/fields.incl> 
+#include <library/cpp/protobuf/json/ut/fields.incl>
 #undef DEFINE_FIELD
 
         TFlatRepeated proto;
diff --git a/library/cpp/protobuf/json/ut/string_transform_ut.cpp b/library/cpp/protobuf/json/ut/string_transform_ut.cpp
index 64e2f71bb4..a31dabcb0f 100644
--- a/library/cpp/protobuf/json/ut/string_transform_ut.cpp
+++ b/library/cpp/protobuf/json/ut/string_transform_ut.cpp
@@ -1,7 +1,7 @@
 #include "json.h"
 
 #include <library/cpp/testing/unittest/registar.h>
-#include <library/cpp/protobuf/json/proto2json.h> 
+#include <library/cpp/protobuf/json/proto2json.h>
 
 Y_UNIT_TEST_SUITE(TDoubleEscapeTransform) {
     Y_UNIT_TEST(TestEmptyString) {
diff --git a/library/cpp/protobuf/json/ut/ya.make b/library/cpp/protobuf/json/ut/ya.make
index 8b9c9fd3bc..b60a6d3c17 100644
--- a/library/cpp/protobuf/json/ut/ya.make
+++ b/library/cpp/protobuf/json/ut/ya.make
@@ -1,4 +1,4 @@
-UNITTEST_FOR(library/cpp/protobuf/json) 
+UNITTEST_FOR(library/cpp/protobuf/json)
 
 OWNER(avitella)
 
@@ -17,7 +17,7 @@ SRCS(
 GENERATE_ENUM_SERIALIZATION(test.pb.h)
 
 PEERDIR(
-    library/cpp/protobuf/json 
+    library/cpp/protobuf/json
 )
 
 END()
diff --git a/library/cpp/protobuf/json/ya.make b/library/cpp/protobuf/json/ya.make
index 8b7104cf2a..2f2c75cfdb 100644
--- a/library/cpp/protobuf/json/ya.make
+++ b/library/cpp/protobuf/json/ya.make
@@ -17,8 +17,8 @@ SRCS(
 
 PEERDIR(
     contrib/libs/protobuf
-    library/cpp/json 
-    library/cpp/protobuf/util 
+    library/cpp/json
+    library/cpp/protobuf/util
     library/cpp/string_utils/relaxed_escaper
 )
 
diff --git a/library/cpp/protobuf/util/is_equal_ut.cpp b/library/cpp/protobuf/util/is_equal_ut.cpp
index f8c8c28b45..3ca4c90dd5 100644
--- a/library/cpp/protobuf/util/is_equal_ut.cpp
+++ b/library/cpp/protobuf/util/is_equal_ut.cpp
@@ -1,5 +1,5 @@
 #include "is_equal.h"
-#include <library/cpp/protobuf/util/ut/sample_for_is_equal.pb.h> 
+#include <library/cpp/protobuf/util/ut/sample_for_is_equal.pb.h>
 
 #include <library/cpp/testing/unittest/registar.h>
 
diff --git a/library/cpp/protobuf/util/iterators_ut.cpp b/library/cpp/protobuf/util/iterators_ut.cpp
index 0b15f1f276..9ebcff2963 100644
--- a/library/cpp/protobuf/util/iterators_ut.cpp
+++ b/library/cpp/protobuf/util/iterators_ut.cpp
@@ -1,6 +1,6 @@
 #include "iterators.h"
 #include "simple_reflection.h"
-#include <library/cpp/protobuf/util/ut/common_ut.pb.h> 
+#include <library/cpp/protobuf/util/ut/common_ut.pb.h>
 
 #include <library/cpp/testing/unittest/registar.h>
 
diff --git a/library/cpp/protobuf/util/merge.cpp b/library/cpp/protobuf/util/merge.cpp
index e2c8ab8e53..dc2b9cc806 100644
--- a/library/cpp/protobuf/util/merge.cpp
+++ b/library/cpp/protobuf/util/merge.cpp
@@ -3,7 +3,7 @@
 
 #include <google/protobuf/message.h>
 
-#include <library/cpp/protobuf/util/proto/merge.pb.h> 
+#include <library/cpp/protobuf/util/proto/merge.pb.h>
 
 namespace NProtoBuf {
     void RewriteMerge(const Message& src, Message& dst) {
diff --git a/library/cpp/protobuf/util/merge_ut.cpp b/library/cpp/protobuf/util/merge_ut.cpp
index a1d9b6b50a..22217db183 100644
--- a/library/cpp/protobuf/util/merge_ut.cpp
+++ b/library/cpp/protobuf/util/merge_ut.cpp
@@ -1,5 +1,5 @@
 #include "merge.h"
-#include <library/cpp/protobuf/util/ut/common_ut.pb.h> 
+#include <library/cpp/protobuf/util/ut/common_ut.pb.h>
 
 #include <library/cpp/testing/unittest/registar.h>
 
diff --git a/library/cpp/protobuf/util/pb_io.cpp b/library/cpp/protobuf/util/pb_io.cpp
index 6e15748ca5..6270ee0624 100644
--- a/library/cpp/protobuf/util/pb_io.cpp
+++ b/library/cpp/protobuf/util/pb_io.cpp
@@ -1,6 +1,6 @@
 #include "pb_io.h"
 
-#include <library/cpp/binsaver/bin_saver.h> 
+#include <library/cpp/binsaver/bin_saver.h>
 #include <library/cpp/string_utils/base64/base64.h>
 
 #include <google/protobuf/message.h>
diff --git a/library/cpp/protobuf/util/pb_io_ut.cpp b/library/cpp/protobuf/util/pb_io_ut.cpp
index baade8a6ea..875d6dc602 100644
--- a/library/cpp/protobuf/util/pb_io_ut.cpp
+++ b/library/cpp/protobuf/util/pb_io_ut.cpp
@@ -2,7 +2,7 @@
 
 #include "is_equal.h"
 
-#include <library/cpp/protobuf/util/ut/common_ut.pb.h> 
+#include <library/cpp/protobuf/util/ut/common_ut.pb.h>
 
 #include <library/cpp/testing/unittest/registar.h>
 
diff --git a/library/cpp/protobuf/util/repeated_field_utils_ut.cpp b/library/cpp/protobuf/util/repeated_field_utils_ut.cpp
index 1c9b717753..58aaaa9e12 100644
--- a/library/cpp/protobuf/util/repeated_field_utils_ut.cpp
+++ b/library/cpp/protobuf/util/repeated_field_utils_ut.cpp
@@ -1,5 +1,5 @@
 #include "repeated_field_utils.h"
-#include <library/cpp/protobuf/util/ut/common_ut.pb.h> 
+#include <library/cpp/protobuf/util/ut/common_ut.pb.h>
 
 #include <library/cpp/testing/unittest/registar.h>
 
diff --git a/library/cpp/protobuf/util/simple_reflection_ut.cpp b/library/cpp/protobuf/util/simple_reflection_ut.cpp
index ee41e0adb6..169d4703c9 100644
--- a/library/cpp/protobuf/util/simple_reflection_ut.cpp
+++ b/library/cpp/protobuf/util/simple_reflection_ut.cpp
@@ -1,6 +1,6 @@
 #include "simple_reflection.h"
-#include <library/cpp/protobuf/util/ut/sample_for_simple_reflection.pb.h> 
-#include <library/cpp/protobuf/util/ut/extensions.pb.h> 
+#include <library/cpp/protobuf/util/ut/sample_for_simple_reflection.pb.h>
+#include <library/cpp/protobuf/util/ut/extensions.pb.h>
 
 #include <library/cpp/testing/unittest/registar.h>
 
diff --git a/library/cpp/protobuf/util/ut/common_ut.proto b/library/cpp/protobuf/util/ut/common_ut.proto
index c1cf48b362..9cf803ffbf 100644
--- a/library/cpp/protobuf/util/ut/common_ut.proto
+++ b/library/cpp/protobuf/util/ut/common_ut.proto
@@ -1,5 +1,5 @@
 import "google/protobuf/descriptor.proto";
-import "library/cpp/protobuf/util/proto/merge.proto"; 
+import "library/cpp/protobuf/util/proto/merge.proto";
 
 package NProtobufUtilUt;
 
diff --git a/library/cpp/protobuf/util/ut/extensions.proto b/library/cpp/protobuf/util/ut/extensions.proto
index 6b2899370f..4944f0f5ca 100644
--- a/library/cpp/protobuf/util/ut/extensions.proto
+++ b/library/cpp/protobuf/util/ut/extensions.proto
@@ -1,6 +1,6 @@
 package NExt;
 
-import "library/cpp/protobuf/util/ut/sample_for_simple_reflection.proto"; 
+import "library/cpp/protobuf/util/ut/sample_for_simple_reflection.proto";
 
 message TTestExt {
     extend TSample {
diff --git a/library/cpp/protobuf/util/ut/ya.make b/library/cpp/protobuf/util/ut/ya.make
index 0118af31ac..701ba9a8c8 100644
--- a/library/cpp/protobuf/util/ut/ya.make
+++ b/library/cpp/protobuf/util/ut/ya.make
@@ -1,6 +1,6 @@
 OWNER(nga)
 
-UNITTEST_FOR(library/cpp/protobuf/util) 
+UNITTEST_FOR(library/cpp/protobuf/util)
 
 SRCS(
     extensions.proto
diff --git a/library/cpp/protobuf/util/walk_ut.cpp b/library/cpp/protobuf/util/walk_ut.cpp
index 68738ad8e4..2ea6071b17 100644
--- a/library/cpp/protobuf/util/walk_ut.cpp
+++ b/library/cpp/protobuf/util/walk_ut.cpp
@@ -1,6 +1,6 @@
 #include "walk.h"
 #include "simple_reflection.h"
-#include <library/cpp/protobuf/util/ut/common_ut.pb.h> 
+#include <library/cpp/protobuf/util/ut/common_ut.pb.h>
 
 #include <library/cpp/testing/unittest/registar.h>
 
diff --git a/library/cpp/protobuf/util/ya.make b/library/cpp/protobuf/util/ya.make
index cdeb3849ce..b62028af58 100644
--- a/library/cpp/protobuf/util/ya.make
+++ b/library/cpp/protobuf/util/ya.make
@@ -4,8 +4,8 @@ OWNER(mowgli)
 
 PEERDIR(
     contrib/libs/protobuf
-    library/cpp/binsaver 
-    library/cpp/protobuf/util/proto 
+    library/cpp/binsaver
+    library/cpp/protobuf/util/proto
     library/cpp/string_utils/base64
 )
 
diff --git a/library/cpp/protobuf/ya.make b/library/cpp/protobuf/ya.make
index 69c715c57a..618b542b4f 100644
--- a/library/cpp/protobuf/ya.make
+++ b/library/cpp/protobuf/ya.make
@@ -1,19 +1,19 @@
 RECURSE(
     dynamic_prototype
-    from_xml 
-    from_xml/ut 
-    interop 
-    interop/ut 
-    json 
-    json/ut 
-    parser 
-    parser/ut 
-    protofile 
-    protofile/ut 
-    util 
-    util/proto 
-    yql 
-    yql/ut 
+    from_xml
+    from_xml/ut
+    interop
+    interop/ut
+    json
+    json/ut
+    parser
+    parser/ut
+    protofile
+    protofile/ut
+    util
+    util/proto
+    yql
+    yql/ut
     yandex_patches_ut
-    yt 
+    yt
 )