Merge yexception.h and bt_exception.h to prevent include cycle

commit_hash:4a6a74639669cf2836dedbc7b61efb1f43faef1f

20 files changed, 34 insertions, 47 deletions

diff --git a/library/cpp/codecs/codecs.h b/library/cpp/codecs/codecs.h
index cc5e72b2850..c5aa177c665 100644
--- a/library/cpp/codecs/codecs.h
+++ b/library/cpp/codecs/codecs.h
@@ -2,7 +2,7 @@
 
 #include "sample.h"
 
-#include <util/generic/bt_exception.h>
+#include <util/generic/yexception.h>
 #include <util/generic/hash.h>
 #include <util/generic/ptr.h>
 #include <util/generic/singleton.h>
diff --git a/library/cpp/config/config.h b/library/cpp/config/config.h
index 16d2d7edf93..2b53cca9525 100644
--- a/library/cpp/config/config.h
+++ b/library/cpp/config/config.h
@@ -11,7 +11,7 @@
 #include <util/system/type_name.h>
 #include <util/generic/vector.h>
 #include <util/generic/yexception.h>
-#include <util/generic/bt_exception.h>
+#include <util/generic/yexception.h>
 #include <util/ysaveload.h>
 
 class IInputStream;
diff --git a/library/cpp/json/writer/json_value.cpp b/library/cpp/json/writer/json_value.cpp
index 6d57ef669a7..344a2cd1648 100644
--- a/library/cpp/json/writer/json_value.cpp
+++ b/library/cpp/json/writer/json_value.cpp
@@ -12,7 +12,7 @@
 #include <util/string/vector.h>
 #include <util/system/yassert.h>
 #include <util/ysaveload.h>
-#include <util/generic/bt_exception.h>
+#include <util/generic/yexception.h>
 
 static bool
 AreJsonMapsEqual(const NJson::TJsonValue& lhs, const NJson::TJsonValue& rhs) {
diff --git a/library/cpp/testing/benchmark/examples/main.cpp b/library/cpp/testing/benchmark/examples/main.cpp
index ddd8b05ffc7..f3b737f1850 100644
--- a/library/cpp/testing/benchmark/examples/main.cpp
+++ b/library/cpp/testing/benchmark/examples/main.cpp
@@ -4,7 +4,7 @@
 #include <util/generic/algorithm.h>
 #include <util/generic/vector.h>
 #include <util/generic/yexception.h>
-#include <util/generic/bt_exception.h>
+#include <util/generic/yexception.h>
 
 Y_CPU_BENCHMARK(F, iface) {
     TVector<size_t> x;
diff --git a/library/cpp/testing/unittest/registar.cpp b/library/cpp/testing/unittest/registar.cpp
index 675d1f60030..d48f13813e3 100644
--- a/library/cpp/testing/unittest/registar.cpp
+++ b/library/cpp/testing/unittest/registar.cpp
@@ -3,7 +3,7 @@
 #include <library/cpp/diff/diff.h>
 #include <library/cpp/colorizer/colors.h>
 
-#include <util/generic/bt_exception.h>
+#include <util/generic/yexception.h>
 #include <util/random/fast.h>
 #include <util/string/printf.h>
 #include <util/system/backtrace.h>
diff --git a/library/cpp/testing/unittest/registar.h b/library/cpp/testing/unittest/registar.h
index 312796ccf03..c65c79e79f4 100644
--- a/library/cpp/testing/unittest/registar.h
+++ b/library/cpp/testing/unittest/registar.h
@@ -2,7 +2,7 @@
 
 #include <library/cpp/dbg_output/dump.h>
 
-#include <util/generic/bt_exception.h>
+#include <util/generic/yexception.h>
 #include <util/generic/hash.h>
 #include <util/generic/intrlist.h>
 #include <util/generic/map.h>
diff --git a/library/cpp/yson/node/node.h b/library/cpp/yson/node/node.h
index 2e60dd1abd3..1bce18fed50 100644
--- a/library/cpp/yson/node/node.h
+++ b/library/cpp/yson/node/node.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <util/generic/bt_exception.h>
+#include <util/generic/yexception.h>
 #include <util/generic/cast.h>
 #include <util/generic/hash.h>
 #include <util/generic/vector.h>
diff --git a/library/cpp/yson_pull/read_ops.h b/library/cpp/yson_pull/read_ops.h
index 5c084983ead..c55b510b88f 100644
--- a/library/cpp/yson_pull/read_ops.h
+++ b/library/cpp/yson_pull/read_ops.h
@@ -3,7 +3,7 @@
 #include "reader.h"
 
 #include <util/generic/maybe.h>
-#include <util/generic/bt_exception.h>
+#include <util/generic/yexception.h>
 #include <util/generic/yexception.h>
 #include <util/system/yassert.h>
 
diff --git a/util/generic/bt_exception.cpp b/util/generic/bt_exception.cpp
deleted file mode 100644
index 609870c4c00..00000000000
--- a/util/generic/bt_exception.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include "bt_exception.h"
diff --git a/util/generic/bt_exception.h b/util/generic/bt_exception.h
deleted file mode 100644
index 018d2bc89a1..00000000000
--- a/util/generic/bt_exception.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#pragma once
-
-#include <utility>
-#include "yexception.h"
-
-#include <util/system/backtrace.h>
-
-template <class T>
-class TWithBackTrace: public T {
-public:
-    template <typename... Args>
-    inline TWithBackTrace(Args&&... args)
-        : T(std::forward<Args>(args)...)
-    {
-        BT_.Capture();
-    }
-
-    const TBackTrace* BackTrace() const noexcept override {
-        return &BT_;
-    }
-
-private:
-    TBackTrace BT_;
-};
diff --git a/util/generic/yexception.cpp b/util/generic/yexception.cpp
index dd52fe78fad..6611fb51ff9 100644
--- a/util/generic/yexception.cpp
+++ b/util/generic/yexception.cpp
@@ -1,4 +1,3 @@
-#include "bt_exception.h"
 #include "yexception.h"
 
 #include <util/system/backtrace.h>
diff --git a/util/generic/yexception.h b/util/generic/yexception.h
index 3e7958126a4..68eae8e43a7 100644
--- a/util/generic/yexception.h
+++ b/util/generic/yexception.h
@@ -1,13 +1,12 @@
 #pragma once
 
-#include "bt_exception.h"
 #include "strbuf.h"
 #include "string.h"
 #include "utility.h"
 #include "va_args.h"
-#include <utility>
 
 #include <util/stream/tempbuf.h>
+#include <util/system/backtrace.h>
 #include <util/system/compat.h>
 #include <util/system/compiler.h>
 #include <util/system/defaults.h>
@@ -16,11 +15,9 @@
 #include <util/system/platform.h>
 
 #include <exception>
-
+#include <utility>
 #include <cstdio>
 
-class TBackTrace;
-
 namespace NPrivateException {
     class TTempBufCuttingWrapperOutput: public IOutputStream {
     public:
@@ -138,6 +135,24 @@ struct TBadArgumentException: public virtual yexception {
 struct TBadCastException: public virtual TBadArgumentException {
 };
 
+template <class T>
+class TWithBackTrace: public T {
+public:
+    template <typename... Args>
+    inline TWithBackTrace(Args&&... args)
+        : T(std::forward<Args>(args)...)
+    {
+        BT_.Capture();
+    }
+
+    const TBackTrace* BackTrace() const noexcept override {
+        return &BT_;
+    }
+
+private:
+    TBackTrace BT_;
+};
+
 #define ythrow throw __LOCATION__ +
 
 namespace NPrivate {
diff --git a/util/generic/yexception_ut.cpp b/util/generic/yexception_ut.cpp
index 5e6d87e9c5e..9a42091cf07 100644
--- a/util/generic/yexception_ut.cpp
+++ b/util/generic/yexception_ut.cpp
@@ -18,7 +18,6 @@ static inline void Throw2DontMove() {
 #include <util/string/split.h>
 
 #include "yexception_ut.h"
-#include "bt_exception.h"
 
 #if defined(_MSC_VER)
     #pragma warning(disable : 4702) /*unreachable code*/
diff --git a/util/ya.make b/util/ya.make
index 93bcc964a48..3da4beec5e1 100644
--- a/util/ya.make
+++ b/util/ya.make
@@ -86,7 +86,6 @@ JOIN_SRCS(
     generic/array_size.cpp
     generic/bitmap.cpp
     generic/bitops.cpp
-    generic/bt_exception.cpp
     generic/buffer.cpp
     generic/cast.cpp
     generic/deque.cpp
diff --git a/yql/essentials/ast/yql_expr.h b/yql/essentials/ast/yql_expr.h
index 892845412a4..40cd7bb2d2b 100644
--- a/yql/essentials/ast/yql_expr.h
+++ b/yql/essentials/ast/yql_expr.h
@@ -29,7 +29,7 @@
 #include <util/generic/hash.h>
 #include <util/generic/maybe.h>
 #include <util/generic/set.h>
-#include <util/generic/bt_exception.h>
+#include <util/generic/yexception.h>
 #include <util/generic/algorithm.h>
 #include <util/digest/murmur.h>
 
diff --git a/yql/essentials/udfs/test/simple/simple_udf.cpp b/yql/essentials/udfs/test/simple/simple_udf.cpp
index 759f21380d7..046896f4b27 100644
--- a/yql/essentials/udfs/test/simple/simple_udf.cpp
+++ b/yql/essentials/udfs/test/simple/simple_udf.cpp
@@ -1,4 +1,4 @@
-#include <util/generic/bt_exception.h>
+#include <util/generic/yexception.h>
 #include <util/generic/hash.h>
 #include <util/string/cast.h>
 #include <yql/essentials/public/udf/udf_helpers.h>
diff --git a/yql/tools/yqlrun/http/server.cpp b/yql/tools/yqlrun/http/server.cpp
index 44626f405a8..13525826257 100644
--- a/yql/tools/yqlrun/http/server.cpp
+++ b/yql/tools/yqlrun/http/server.cpp
@@ -7,7 +7,7 @@
 #include <util/datetime/cputimer.h>
 #include <util/system/hostname.h>
 #include <util/stream/buffer.h>
-#include <util/generic/bt_exception.h>
+#include <util/generic/yexception.h>
 
 
 using namespace NYql;
diff --git a/yt/cpp/mapreduce/interface/errors.h b/yt/cpp/mapreduce/interface/errors.h
index 88ffc0b376e..4d7a29784d6 100644
--- a/yt/cpp/mapreduce/interface/errors.h
+++ b/yt/cpp/mapreduce/interface/errors.h
@@ -9,7 +9,7 @@
 
 #include <library/cpp/yson/node/node.h>
 
-#include <util/generic/bt_exception.h>
+#include <util/generic/yexception.h>
 #include <util/generic/guid.h>
 #include <util/generic/string.h>
 #include <util/generic/vector.h>
diff --git a/yt/cpp/mapreduce/interface/operation-inl.h b/yt/cpp/mapreduce/interface/operation-inl.h
index db900c1438a..462cbfd516d 100644
--- a/yt/cpp/mapreduce/interface/operation-inl.h
+++ b/yt/cpp/mapreduce/interface/operation-inl.h
@@ -8,7 +8,7 @@
 
 #include "errors.h"
 
-#include <util/generic/bt_exception.h>
+#include <util/generic/yexception.h>
 #include <util/generic/singleton.h>
 #include <util/system/type_name.h>
 
diff --git a/yt/cpp/mapreduce/tests/yt_unittest_lib/yt_unittest_lib.h b/yt/cpp/mapreduce/tests/yt_unittest_lib/yt_unittest_lib.h
index 9b8ffbe9218..6a470b9086a 100644
--- a/yt/cpp/mapreduce/tests/yt_unittest_lib/yt_unittest_lib.h
+++ b/yt/cpp/mapreduce/tests/yt_unittest_lib/yt_unittest_lib.h
@@ -7,7 +7,7 @@
 
 #include <library/cpp/yson/node/node_io.h>
 
-#include <util/generic/bt_exception.h>
+#include <util/generic/yexception.h>
 
 #include <util/datetime/base.h>