carbon-language/carbon-lang
1
0
Fork 0
mirror of https://github.com/carbon-language/carbon-lang.git synced 2026-09-24 13:40:11 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

Replace C-style variadic with a concept (#7761)

Browse Source 
clang-tidy 24 warns on C-style variadics, and we don't need to use one
here anymore. Instead of a function call with an argument list, use a
concept to determine if a type can be list initialized.
This commit is contained in:
Dana Jansens
2026-09-10 21:26:37 +00:00
committed by GitHub
parent eca38a90e1
commit 8732bd9de1
2 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/struct_reflection.h
+2 -8
View File
@@ -55,13 +55,7 @@ struct AnyField {
// Detector for whether we can list-initialize T from the given list of fields.
template <typename T, typename... Fields>
constexpr auto CanListInitialize(decltype(T{Fields()...})* /*unused*/) -> bool {
return true;
}
template <typename T, typename... Fields>
constexpr auto CanListInitialize(...) -> bool {
return false;
}
concept CanListInitialize = requires { T{Fields()...}; };
#pragma clang diagnostic pop
@@ -72,7 +66,7 @@ constexpr auto CanListInitialize(...) -> bool {
// 2) Add more AnyField<T>s until we can't initialize any more.
template <typename T, bool AnyWorkedSoFar = false, typename... Fields>
constexpr auto CountFields() -> int {
if constexpr (CanListInitialize<T, Fields...>(nullptr)) {
if constexpr (CanListInitialize<T, Fields...>) {
return CountFields<T, true, Fields..., AnyField<T>>();
} else if constexpr (AnyWorkedSoFar) {
constexpr int NumFields = sizeof...(Fields) - 1;
common/struct_reflection_test.cpp
+6 -6
View File
@@ -53,17 +53,17 @@ TEST(StructReflectionTest, CanListInitialize) {
{
using Type = OneField;
using Field = Internal::AnyField<Type>;
static_assert(Internal::CanListInitialize<Type>(nullptr));
static_assert(Internal::CanListInitialize<Type, Field>(nullptr));
static_assert(!Internal::CanListInitialize<Type, Field, Field>(0));
static_assert(Internal::CanListInitialize<Type>);
static_assert(Internal::CanListInitialize<Type, Field>);
static_assert(!Internal::CanListInitialize<Type, Field, Field>);
}
{
using Type = OneFieldNoDefaultConstructor;
using Field = Internal::AnyField<Type>;
static_assert(!Internal::CanListInitialize<Type>(0));
static_assert(Internal::CanListInitialize<Type, Field>(nullptr));
static_assert(!Internal::CanListInitialize<Type, Field, Field>(0));
static_assert(!Internal::CanListInitialize<Type>);
static_assert(Internal::CanListInitialize<Type, Field>);
static_assert(!Internal::CanListInitialize<Type, Field, Field>);
}
}