return by braced init list

shorter

Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev
2021-11-11 02:18:46 -08:00
parent e08c85ae2d
commit 250011f016
14 changed files with 22 additions and 22 deletions

View File

@@ -44,7 +44,7 @@ try {
#ifdef HAVE_ICU
const auto u = UCharFromUTF8(src);
if (u.IsNull())
return AllocatedString(src);
return {src};
AllocatedArray<UChar> folded(u.size() * 2U);
@@ -54,7 +54,7 @@ try {
U_FOLD_CASE_DEFAULT,
&error_code);
if (folded_length == 0 || error_code != U_ZERO_ERROR)
return AllocatedString(src);
return {src};
folded.SetSize(folded_length);
return UCharToUTF8({folded.begin(), folded.size()});
@@ -63,7 +63,7 @@ try {
#error not implemented
#endif
} catch (...) {
return AllocatedString(src);
return {src};
}
#endif /* HAVE_ICU_CASE_FOLD */

View File

@@ -152,7 +152,7 @@ IcuConverter::FromUTF8(std::string_view s) const
throw std::runtime_error(fmt::format(FMT_STRING("Failed to convert from Unicode: {}"),
u_errorName(code)));
return AllocatedString({buffer, size_t(target - buffer)});
return {{buffer, size_t(target - buffer)}};
#elif defined(HAVE_ICONV)
return DoConvert(from_utf8, s);