diff options
author | grickevich <grickevich@yandex-team.ru> | 2022-02-10 16:48:59 +0300 |
---|---|---|
committer | Daniil Cherednik <dcherednik@yandex-team.ru> | 2022-02-10 16:48:59 +0300 |
commit | b269ec1b854e2a830dbde2b5328a262a6a249b98 (patch) | |
tree | 5141ed0e2f98e033ea19987d51a7ae7429dc2fdd /util/generic | |
parent | 2704bb412325db71fb2c5b3ffb25ce693c1d1298 (diff) | |
download | ydb-b269ec1b854e2a830dbde2b5328a262a6a249b98.tar.gz |
Restoring authorship annotation for <grickevich@yandex-team.ru>. Commit 1 of 2.
Diffstat (limited to 'util/generic')
-rw-r--r-- | util/generic/maybe_ut.cpp | 90 | ||||
-rw-r--r-- | util/generic/string.h | 4 | ||||
-rw-r--r-- | util/generic/string_ut.h | 2 |
3 files changed, 48 insertions, 48 deletions
diff --git a/util/generic/maybe_ut.cpp b/util/generic/maybe_ut.cpp index 2c1a425c5ef..792d8063542 100644 --- a/util/generic/maybe_ut.cpp +++ b/util/generic/maybe_ut.cpp @@ -156,58 +156,58 @@ Y_UNIT_TEST_SUITE(TMaybeTest) { x = 7; UNIT_ASSERT(m == 7); } - + Y_UNIT_TEST(TestMove) { - struct TMovable { - int Flag = 0; - - TMovable(int flag) - : Flag(flag) - { - } - - TMovable(const TMovable&) = delete; - TMovable& operator=(const TMovable&) = delete; - - TMovable(TMovable&& other) { - std::swap(Flag, other.Flag); - } - TMovable& operator=(TMovable&& other) { - std::swap(Flag, other.Flag); - return *this; - } - }; - - // Move ctor from value - TMovable value1(1); - TMaybe<TMovable> m1(std::move(value1)); - UNIT_ASSERT(m1.Defined()); - UNIT_ASSERT_VALUES_EQUAL(m1->Flag, 1); - - // Move assignment from value - TMovable value2(2); - TMaybe<TMovable> m2; - m2 = std::move(value2); - UNIT_ASSERT(m2.Defined()); - UNIT_ASSERT_VALUES_EQUAL(m2->Flag, 2); - - // Move ctor from maybe - TMaybe<TMovable> m3(std::move(m1)); - UNIT_ASSERT(m3.Defined()); - UNIT_ASSERT_VALUES_EQUAL(m3->Flag, 1); - - // Move assignment from maybe - TMaybe<TMovable> m4; - m4 = std::move(m2); - UNIT_ASSERT(m4.Defined()); - UNIT_ASSERT_VALUES_EQUAL(m4->Flag, 2); + struct TMovable { + int Flag = 0; + + TMovable(int flag) + : Flag(flag) + { + } + + TMovable(const TMovable&) = delete; + TMovable& operator=(const TMovable&) = delete; + + TMovable(TMovable&& other) { + std::swap(Flag, other.Flag); + } + TMovable& operator=(TMovable&& other) { + std::swap(Flag, other.Flag); + return *this; + } + }; + + // Move ctor from value + TMovable value1(1); + TMaybe<TMovable> m1(std::move(value1)); + UNIT_ASSERT(m1.Defined()); + UNIT_ASSERT_VALUES_EQUAL(m1->Flag, 1); + + // Move assignment from value + TMovable value2(2); + TMaybe<TMovable> m2; + m2 = std::move(value2); + UNIT_ASSERT(m2.Defined()); + UNIT_ASSERT_VALUES_EQUAL(m2->Flag, 2); + + // Move ctor from maybe + TMaybe<TMovable> m3(std::move(m1)); + UNIT_ASSERT(m3.Defined()); + UNIT_ASSERT_VALUES_EQUAL(m3->Flag, 1); + + // Move assignment from maybe + TMaybe<TMovable> m4; + m4 = std::move(m2); + UNIT_ASSERT(m4.Defined()); + UNIT_ASSERT_VALUES_EQUAL(m4->Flag, 2); // Move value from temporary maybe instance TMovable o5 = *MakeMaybe<TMovable>(5); UNIT_ASSERT_VALUES_EQUAL(o5.Flag, 5); TMovable o6 = MakeMaybe<TMovable>(6).GetRef(); UNIT_ASSERT_VALUES_EQUAL(o6.Flag, 6); - } + } Y_UNIT_TEST(TestCast) { // Undefined maybe casts to undefined maybe diff --git a/util/generic/string.h b/util/generic/string.h index 8cd8aa6917f..ff239bc09be 100644 --- a/util/generic/string.h +++ b/util/generic/string.h @@ -551,8 +551,8 @@ private: CopyAll(p + s.size(), r...); } - template <typename... R, class TNextCharType, typename = std::enable_if_t<std::is_same<TCharType, TNextCharType>::value>> - static void CopyAll(TCharType* p, const TNextCharType s, const R&... r) { + template <typename... R, class TNextCharType, typename = std::enable_if_t<std::is_same<TCharType, TNextCharType>::value>> + static void CopyAll(TCharType* p, const TNextCharType s, const R&... r) { p[0] = s; CopyAll(p + 1, r...); } diff --git a/util/generic/string_ut.h b/util/generic/string_ut.h index 44bb10bdebe..b0151a1d68a 100644 --- a/util/generic/string_ut.h +++ b/util/generic/string_ut.h @@ -938,7 +938,7 @@ public: UNIT_ASSERT_EQUAL(TStringType::Join(Data._12(), TStringType(Data._345()), Data._6()), Data._123456()); UNIT_ASSERT_EQUAL(TStringType::Join(TStringType(Data._12()), TStringType(Data._345()), Data._6()), Data._123456()); UNIT_ASSERT_EQUAL(TStringType::Join(TStringType(Data.a()), Data.b(), TStringType(Data.cd()), TStringType(Data.e()), Data.fg(), TStringType(Data.h())), Data.abcdefgh()); - UNIT_ASSERT_EQUAL(TStringType::Join(TStringType(Data.a()), static_cast<typename TStringType::char_type>('b'), TStringType(Data.cd()), TStringType(Data.e()), Data.fg(), TStringType(Data.h())), Data.abcdefgh()); + UNIT_ASSERT_EQUAL(TStringType::Join(TStringType(Data.a()), static_cast<typename TStringType::char_type>('b'), TStringType(Data.cd()), TStringType(Data.e()), Data.fg(), TStringType(Data.h())), Data.abcdefgh()); } void TestCopy() { |