diff options
author | babenko <babenko@yandex-team.com> | 2025-02-22 17:28:25 +0300 |
---|---|---|
committer | babenko <babenko@yandex-team.com> | 2025-02-22 17:48:29 +0300 |
commit | 59afaa0cb7cd89146dd10f5446256afcce33bd0e (patch) | |
tree | 38d3c46bcba8da7c3b8ffc6b818695bc6b62d532 /library/cpp/yt/string | |
parent | 1d9cc117e33b162a5247032e175ed7ea26971437 (diff) | |
download | ydb-59afaa0cb7cd89146dd10f5446256afcce33bd0e.tar.gz |
YT-22593: More trivial TString->std::string migrations
[nodiff:runtime]
commit_hash:1ba799aed1703ab7c6304b6da7090b3337f768dd
Diffstat (limited to 'library/cpp/yt/string')
-rw-r--r-- | library/cpp/yt/string/enum-inl.h | 2 | ||||
-rw-r--r-- | library/cpp/yt/string/enum.cpp | 8 | ||||
-rw-r--r-- | library/cpp/yt/string/enum.h | 8 | ||||
-rw-r--r-- | library/cpp/yt/string/string.cpp | 4 | ||||
-rw-r--r-- | library/cpp/yt/string/string.h | 5 | ||||
-rw-r--r-- | library/cpp/yt/string/unittests/guid_ut.cpp | 4 |
6 files changed, 15 insertions, 16 deletions
diff --git a/library/cpp/yt/string/enum-inl.h b/library/cpp/yt/string/enum-inl.h index 84b0941d15..9f8ca893d2 100644 --- a/library/cpp/yt/string/enum-inl.h +++ b/library/cpp/yt/string/enum-inl.h @@ -129,7 +129,7 @@ void FormatEnum(TStringBuilderBase* builder, T value, bool lowerCase) } template <class T> -TString FormatEnum(T value) +std::string FormatEnum(T value) { TStringBuilder builder; FormatEnum(&builder, value, /*lowerCase*/ true); diff --git a/library/cpp/yt/string/enum.cpp b/library/cpp/yt/string/enum.cpp index 935c3e6e3e..844254faa0 100644 --- a/library/cpp/yt/string/enum.cpp +++ b/library/cpp/yt/string/enum.cpp @@ -16,7 +16,7 @@ void ThrowMalformedEnumValueException(TStringBuf typeName, TStringBuf value) } template <bool ThrowOnError> -std::optional<TString> DecodeEnumValueImpl(TStringBuf value) +std::optional<std::string> DecodeEnumValueImpl(TStringBuf value) { auto camelValue = UnderscoreCaseToCamelCase(value); auto underscoreValue = CamelCaseToUnderscoreCase(camelValue); @@ -34,19 +34,19 @@ std::optional<TString> DecodeEnumValueImpl(TStringBuf value) } // namespace NDetail -std::optional<TString> TryDecodeEnumValue(TStringBuf value) +std::optional<std::string> TryDecodeEnumValue(TStringBuf value) { return NDetail::DecodeEnumValueImpl<false>(value); } -TString DecodeEnumValue(TStringBuf value) +std::string DecodeEnumValue(TStringBuf value) { auto decodedValue = NDetail::DecodeEnumValueImpl<true>(value); YT_VERIFY(decodedValue); return *decodedValue; } -TString EncodeEnumValue(TStringBuf value) +std::string EncodeEnumValue(TStringBuf value) { return CamelCaseToUnderscoreCase(value); } diff --git a/library/cpp/yt/string/enum.h b/library/cpp/yt/string/enum.h index a0be527583..de7d6a52fa 100644 --- a/library/cpp/yt/string/enum.h +++ b/library/cpp/yt/string/enum.h @@ -10,9 +10,9 @@ namespace NYT { //////////////////////////////////////////////////////////////////////////////// -std::optional<TString> TryDecodeEnumValue(TStringBuf value); -TString DecodeEnumValue(TStringBuf value); -TString EncodeEnumValue(TStringBuf value); +std::optional<std::string> TryDecodeEnumValue(TStringBuf value); +std::string DecodeEnumValue(TStringBuf value); +std::string EncodeEnumValue(TStringBuf value); template <class T> std::optional<T> TryParseEnum(TStringBuf str, bool enableUnknown = false); @@ -24,7 +24,7 @@ template <class T> void FormatEnum(TStringBuilderBase* builder, T value, bool lowerCase); template <class T> -TString FormatEnum(T value); +std::string FormatEnum(T value); //////////////////////////////////////////////////////////////////////////////// diff --git a/library/cpp/yt/string/string.cpp b/library/cpp/yt/string/string.cpp index b9c3236134..ed51f453fb 100644 --- a/library/cpp/yt/string/string.cpp +++ b/library/cpp/yt/string/string.cpp @@ -359,7 +359,7 @@ TStringBuf FormatBool(bool value) //////////////////////////////////////////////////////////////////////////////// -void TruncateStringInplace(TString* string, int lengthLimit, TStringBuf truncatedSuffix) +void TruncateStringInplace(std::string* string, int lengthLimit, TStringBuf truncatedSuffix) { if (std::ssize(*string) > lengthLimit) { string->resize(lengthLimit); @@ -367,7 +367,7 @@ void TruncateStringInplace(TString* string, int lengthLimit, TStringBuf truncate } } -TString TruncateString(TString string, int lengthLimit, TStringBuf truncatedSuffix) +std::string TruncateString(std::string string, int lengthLimit, TStringBuf truncatedSuffix) { TruncateStringInplace(&string, lengthLimit, truncatedSuffix); return string; diff --git a/library/cpp/yt/string/string.h b/library/cpp/yt/string/string.h index ac5aa5d4e4..5e472a572c 100644 --- a/library/cpp/yt/string/string.h +++ b/library/cpp/yt/string/string.h @@ -183,9 +183,8 @@ TStringBuf FormatBool(bool value); inline constexpr TStringBuf DefaultTruncatedMessage = "...<truncated>"; -void TruncateStringInplace(TString* string, int lengthLimit, TStringBuf truncatedSuffix = DefaultTruncatedMessage); - -TString TruncateString(TString string, int lengthLimit, TStringBuf truncatedSuffix = DefaultTruncatedMessage); +void TruncateStringInplace(std::string* string, int lengthLimit, TStringBuf truncatedSuffix = DefaultTruncatedMessage); +std::string TruncateString(std::string string, int lengthLimit, TStringBuf truncatedSuffix = DefaultTruncatedMessage); //////////////////////////////////////////////////////////////////////////////// diff --git a/library/cpp/yt/string/unittests/guid_ut.cpp b/library/cpp/yt/string/unittests/guid_ut.cpp index ed02b87391..9cff37c380 100644 --- a/library/cpp/yt/string/unittests/guid_ut.cpp +++ b/library/cpp/yt/string/unittests/guid_ut.cpp @@ -12,7 +12,7 @@ namespace { static_assert(CFormattable<TGuid>); -TString CanonicalToString(TGuid value) +std::string CanonicalToString(TGuid value) { return Sprintf("%x-%x-%x-%x", value.Parts32[3], @@ -48,7 +48,7 @@ TEST(TGuidTest, FormatAllSymbols) TEST(TGuidTest, ByteOrder) { auto guid = TGuid::FromStringHex32("12345678ABCDEF0112345678ABCDEF01"); - TString bytes{reinterpret_cast<const char*>(&(guid.Parts32[0])), 16}; + std::string bytes{reinterpret_cast<const char*>(&(guid.Parts32[0])), 16}; EXPECT_EQ(HexEncode(bytes), "01EFCDAB7856341201EFCDAB78563412"); } |