Fix reimports

commit_hash:b4b0ee880890478723bec5ff7a5083ba1db1d1f7

8 files changed, 52 insertions, 36 deletions

diff --git a/contrib/libs/protobuf/src/google/protobuf/extension_set.h b/contrib/libs/protobuf/src/google/protobuf/extension_set.h
index c17bf4dc8a..a68db9efc1 100644
--- a/contrib/libs/protobuf/src/google/protobuf/extension_set.h
+++ b/contrib/libs/protobuf/src/google/protobuf/extension_set.h
@@ -1564,4 +1564,5 @@ void LinkExtensionReflection(
 }  // namespace google
 
 #include "google/protobuf/port_undef.inc"
+
 #endif  // GOOGLE_PROTOBUF_EXTENSION_SET_H__
diff --git a/contrib/libs/protobuf/src/google/protobuf/json/internal/parser.cc b/contrib/libs/protobuf/src/google/protobuf/json/internal/parser.cc
index 0da57a1f05..3bacf60c3b 100644
--- a/contrib/libs/protobuf/src/google/protobuf/json/internal/parser.cc
+++ b/contrib/libs/protobuf/src/google/protobuf/json/internal/parser.cc
@@ -972,11 +972,9 @@ y_absl::Status ParseFieldMask(JsonLexer& lex, const Desc<Traits>& desc,
     // Assume approximately six-letter words, so add one extra space for an
     // underscore for every six bytes.
     snake_path.reserve(path.size() * 7 / 6);
-
-    // Port from protobuf 21.x for entity/ugc (TODO remove?).
+    // Port from protobuf 21.x
     bool is_quoted = false;
     bool is_escaping = false;
-
     for (char c : path) {
       // Outputs quoted string as-is.
       if (is_quoted) {
diff --git a/contrib/libs/protobuf/ya.make b/contrib/libs/protobuf/ya.make
index ef458741f3..e72de69ce9 100644
--- a/contrib/libs/protobuf/ya.make
+++ b/contrib/libs/protobuf/ya.make
@@ -43,9 +43,9 @@ ENDIF()
 
 PEERDIR(
     contrib/libs/zlib
-    library/cpp/sanitizer/include
-    contrib/restricted/abseil-cpp-tstring/y_absl/status
     contrib/restricted/abseil-cpp-tstring/y_absl/log
+    contrib/restricted/abseil-cpp-tstring/y_absl/status
+    library/cpp/sanitizer/include
 )
 
 ADDINCL(
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/ya.make b/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/ya.make
index b4b0267449..b8fee8b070 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/ya.make
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/ya.make
@@ -19,21 +19,21 @@ ADDINCL(
 
 NO_COMPILER_WARNINGS()
 
-IF(NOT Y_ABSL_DONT_USE_DEBUG)
-SRCS(
-    failure_signal_handler.cc
-    internal/address_is_readable.cc
-    internal/decode_rust_punycode.cc
-    internal/demangle.cc
-    internal/demangle_rust.cc
-    internal/elf_mem_image.cc
-    internal/examine_stack.cc
-    internal/utf8_for_code_point.cc
-    internal/vdso_support.cc
-    leak_check.cc
-    stacktrace.cc
-    symbolize.cc
-)
+IF (NOT Y_ABSL_DONT_USE_DEBUG)
+    SRCS(
+        failure_signal_handler.cc
+        internal/address_is_readable.cc
+        internal/decode_rust_punycode.cc
+        internal/demangle.cc
+        internal/demangle_rust.cc
+        internal/elf_mem_image.cc
+        internal/examine_stack.cc
+        internal/utf8_for_code_point.cc
+        internal/vdso_support.cc
+        leak_check.cc
+        stacktrace.cc
+        symbolize.cc
+    )
 ENDIF()
 
 END()
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/log/ya.make b/contrib/restricted/abseil-cpp-tstring/y_absl/log/ya.make
index 74000ae8ee..746cf7a0cd 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/log/ya.make
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/log/ya.make
@@ -32,8 +32,10 @@ ENDIF()
 
 NO_COMPILER_WARNINGS()
 
-IF(Y_ABSL_DONT_USE_DEBUG)
-    CFLAGS(-DY_ABSL_DONT_USE_DEBUG_LIBRARY=1)
+IF (Y_ABSL_DONT_USE_DEBUG)
+    CFLAGS(
+        -DY_ABSL_DONT_USE_DEBUG_LIBRARY=1
+    )
 ENDIF()
 
 SRCS(
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/strings/ya.make b/contrib/restricted/abseil-cpp-tstring/y_absl/strings/ya.make
index 74d25c05f5..a2d57d8f20 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/strings/ya.make
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/strings/ya.make
@@ -19,12 +19,14 @@ ADDINCL(
 
 NO_COMPILER_WARNINGS()
 
-SRCDIR(contrib/restricted/abseil-cpp-tstring/y_absl)
-
-IF(Y_ABSL_DONT_USE_DEBUG)
-    CFLAGS(-DY_ABSL_DONT_USE_DEBUG_LIBRARY=1)
+IF (Y_ABSL_DONT_USE_DEBUG)
+    CFLAGS(
+        -DY_ABSL_DONT_USE_DEBUG_LIBRARY=1
+    )
 ENDIF()
 
+SRCDIR(contrib/restricted/abseil-cpp-tstring/y_absl)
+
 SRCS(
     crc/crc32c.cc
     crc/internal/cpu_detect.cc
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/synchronization/mutex.cc b/contrib/restricted/abseil-cpp-tstring/y_absl/synchronization/mutex.cc
index 8fb7c97e39..ac0cd05141 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/synchronization/mutex.cc
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/synchronization/mutex.cc
@@ -434,14 +434,10 @@ static SynchEvent* GetSynchEvent(const void* addr) {
 // if event recording is on
 static void PostSynchEvent(void* obj, int ev) {
   SynchEvent* e = GetSynchEvent(obj);
-#ifdef Y_ABSL_DONT_USE_DEBUG_LIBRARY
-  constexpr bool DONT_COLLECT_STACK_TRACE = 1;
-#else
-  constexpr bool DONT_COLLECT_STACK_TRACE = 0;
-#endif
+#ifndef Y_ABSL_DONT_USE_DEBUG_LIBRARY
   // logging is on if event recording is on and either there's no event struct,
   // or it explicitly says to log
-  if ((e == nullptr || e->log) && !DONT_COLLECT_STACK_TRACE) {
+  if (e == nullptr || e->log) {
     void* pcs[40];
     int n = y_absl::GetStackTrace(pcs, Y_ABSL_ARRAYSIZE(pcs), 1);
     // A buffer with enough space for the ASCII for all the PCs, even on a
@@ -460,6 +456,7 @@ static void PostSynchEvent(void* obj, int ev) {
     Y_ABSL_RAW_LOG(INFO, "%s%p %s %s", event_properties[ev].msg, obj,
                  (e == nullptr ? "" : e->name), buffer);
   }
+#endif
   const int flags = event_properties[ev].flags;
   if ((flags & SYNCH_F_LCK) != 0 && e != nullptr && e->invariant != nullptr) {
     // Calling the invariant as is causes problems under ThreadSanitizer.
@@ -1325,6 +1322,7 @@ static inline void DebugOnlyLockLeave(Mutex* mu) {
 
 static char* StackString(void** pcs, int n, char* buf, int maxlen,
                          bool symbolize) {
+#ifndef Y_ABSL_DONT_USE_DEBUG_LIBRARY
   static constexpr int kSymLen = 200;
   char sym[kSymLen];
   int len = 0;
@@ -1344,12 +1342,21 @@ static char* StackString(void** pcs, int n, char* buf, int maxlen,
     len += strlen(&buf[len]);
   }
   return buf;
+#else
+  buf[0] = 0;
+  return buf;
+#endif
 }
 
 static char* CurrentStackString(char* buf, int maxlen, bool symbolize) {
+#ifndef Y_ABSL_DONT_USE_DEBUG_LIBRARY
   void* pcs[40];
   return StackString(pcs, y_absl::GetStackTrace(pcs, Y_ABSL_ARRAYSIZE(pcs), 2), buf,
                      maxlen, symbolize);
+#else
+  buf[0] = 0;
+  return buf;
+#endif
 }
 
 namespace {
@@ -1375,7 +1382,11 @@ struct ScopedDeadlockReportBuffers {
 
 // Helper to pass to GraphCycles::UpdateStackTrace.
 int GetStack(void** stack, int max_depth) {
+#ifndef Y_ABSL_DONT_USE_DEBUG_LIBRARY
   return y_absl::GetStackTrace(stack, max_depth, 3);
+#else
+  return 0;
+#endif
 }
 }  // anonymous namespace
 
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/synchronization/ya.make b/contrib/restricted/abseil-cpp-tstring/y_absl/synchronization/ya.make
index a4eee05708..82ecd4b5ff 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/synchronization/ya.make
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/synchronization/ya.make
@@ -20,12 +20,14 @@ ADDINCL(
     GLOBAL contrib/restricted/abseil-cpp-tstring
 )
 
-IF(Y_ABSL_DONT_USE_DEBUG)
-    CFLAGS(-DY_ABSL_DONT_USE_DEBUG_LIBRARY=1)
-ENDIF()
-
 NO_COMPILER_WARNINGS()
 
+IF (Y_ABSL_DONT_USE_DEBUG)
+    CFLAGS(
+        -DY_ABSL_DONT_USE_DEBUG_LIBRARY=1
+    )
+ENDIF()
+
 SRCS(
     barrier.cc
     blocking_counter.cc