Fix various issues

commit_hash:50f729d3716d8b1f5b852cfc008e228172fb79c4

7 files changed, 9 insertions, 10 deletions

diff --git a/library/cpp/yt/misc/non_null_ptr-inl.h b/library/cpp/yt/memory/non_null_ptr-inl.h
index a14b1e9302..a14b1e9302 100644
--- a/library/cpp/yt/misc/non_null_ptr-inl.h
+++ b/library/cpp/yt/memory/non_null_ptr-inl.h
diff --git a/library/cpp/yt/misc/non_null_ptr.h b/library/cpp/yt/memory/non_null_ptr.h
index 0005e4edb6..f5992216c6 100644
--- a/library/cpp/yt/misc/non_null_ptr.h
+++ b/library/cpp/yt/memory/non_null_ptr.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "concepts.h"
+#include <library/cpp/yt/misc/concepts.h>
 
 namespace NYT {
 
@@ -52,21 +52,20 @@ template <CConst T>
 class TNonNullPtr<T>
     : public TNonNullPtrBase<T>
 {
-    using TMutPtr = TNonNullPtr<std::remove_const_t<T>>;
+    using TMutablePtr = TNonNullPtr<std::remove_const_t<T>>;
 
     using TNonNullPtrBase<T>::TNonNullPtrBase;
 
     friend TNonNullPtr<T> GetPtr<T>(T& ref) noexcept;
 
 public:
-    TNonNullPtr(TMutPtr mutPtr) noexcept
+    TNonNullPtr(TMutablePtr mutPtr) noexcept
         : TNonNullPtrBase<T>()
     {
         TNonNullPtrBase<T>::Ptr_ = mutPtr.Ptr_;
     }
 };
 
-
 ////////////////////////////////////////////////////////////////////////////////
 
 } // namespace NYT
diff --git a/library/cpp/yt/misc/unittests/non_null_ptr_ut.cpp b/library/cpp/yt/memory/unittests/non_null_ptr_ut.cpp
index 8396e403ab..c8e2e993fb 100644
--- a/library/cpp/yt/misc/unittests/non_null_ptr_ut.cpp
+++ b/library/cpp/yt/memory/unittests/non_null_ptr_ut.cpp
@@ -1,6 +1,6 @@
 #include <library/cpp/testing/gtest/gtest.h>
 
-#include <library/cpp/yt/misc/non_null_ptr.h>
+#include <library/cpp/yt/memory/non_null_ptr.h>
 
 namespace NYT {
 namespace {
diff --git a/library/cpp/yt/memory/unittests/ya.make b/library/cpp/yt/memory/unittests/ya.make
index 708586d651..40443b6c0c 100644
--- a/library/cpp/yt/memory/unittests/ya.make
+++ b/library/cpp/yt/memory/unittests/ya.make
@@ -11,11 +11,12 @@ SRCS(
     free_list_ut.cpp
     function_view_ut.cpp
     intrusive_ptr_ut.cpp
-    shared_range_ut.cpp
-    weak_ptr_ut.cpp
+    non_null_ptr_ut.cpp
     ref_ut.cpp
     range_protobuf_repeated_field_ut.cpp
+    shared_range_ut.cpp
     type_erasure_ut.cpp
+    weak_ptr_ut.cpp
 )
 
 IF (NOT OS_WINDOWS)
diff --git a/library/cpp/yt/misc/concepts.h b/library/cpp/yt/misc/concepts.h
index aecad4fe60..eda0bc163f 100644
--- a/library/cpp/yt/misc/concepts.h
+++ b/library/cpp/yt/misc/concepts.h
@@ -77,7 +77,7 @@ template <class T>
 concept CConstRawPtr = CRawPtr<T> && CConst<decltype(*std::declval<T>())>;
 
 template <class T>
-concept CMutRawPtr = CRawPtr<T> && !CConstRawPtr<T>;
+concept CMutableRawPtr = CRawPtr<T> && !CConstRawPtr<T>;
 
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/library/cpp/yt/misc/unittests/ya.make b/library/cpp/yt/misc/unittests/ya.make
index a414c5c8e5..c914ca3061 100644
--- a/library/cpp/yt/misc/unittests/ya.make
+++ b/library/cpp/yt/misc/unittests/ya.make
@@ -8,7 +8,6 @@ SRCS(
     enum_ut.cpp
     guid_ut.cpp
     hash_ut.cpp
-    non_null_ptr_ut.cpp
     preprocessor_ut.cpp
     strong_typedef_ut.cpp
     tag_invoke_cpo_ut.cpp
diff --git a/yt/yt/client/api/distributed_table_client.h b/yt/yt/client/api/distributed_table_client.h
index d1bca5bc3a..7417c5b620 100644
--- a/yt/yt/client/api/distributed_table_client.h
+++ b/yt/yt/client/api/distributed_table_client.h
@@ -4,7 +4,7 @@
 
 #include <yt/yt/client/table_client/config.h>
 
-#include <library/cpp/yt/misc/non_null_ptr.h>
+#include <library/cpp/yt/memory/non_null_ptr.h>
 
 namespace NYT::NApi {