Put return type in function body to clarify initialization

Author: wravery

include/graphqlservice/introspection/IntrospectionSchema.h

@@ -34,11 +34,11 @@ enum class TypeKind
 	NON_NULL
 };
 
-constexpr std::array<std::string_view, 8> getTypeKindNames() noexcept
+constexpr auto getTypeKindNames() noexcept
 {
 	using namespace std::literals;
 
-	return { {
+	return std::array<std::string_view, 8> {
 		R"gql(SCALAR)gql"sv,
 		R"gql(OBJECT)gql"sv,
 		R"gql(INTERFACE)gql"sv,
@@ -47,7 +47,7 @@ constexpr std::array<std::string_view, 8> getTypeKindNames() noexcept
 		R"gql(INPUT_OBJECT)gql"sv,
 		R"gql(LIST)gql"sv,
 		R"gql(NON_NULL)gql"sv
-	} };
+	};
 }
 
 enum class DirectiveLocation
@@ -73,11 +73,11 @@ enum class DirectiveLocation
 	INPUT_FIELD_DEFINITION
 };
 
-constexpr std::array<std::string_view, 19> getDirectiveLocationNames() noexcept
+constexpr auto getDirectiveLocationNames() noexcept
 {
 	using namespace std::literals;
 
-	return { {
+	return std::array<std::string_view, 19> {
 		R"gql(QUERY)gql"sv,
 		R"gql(MUTATION)gql"sv,
 		R"gql(SUBSCRIPTION)gql"sv,
@@ -97,7 +97,7 @@ constexpr std::array<std::string_view, 19> getDirectiveLocationNames() noexcept
 		R"gql(ENUM_VALUE)gql"sv,
 		R"gql(INPUT_OBJECT)gql"sv,
 		R"gql(INPUT_FIELD_DEFINITION)gql"sv
-	} };
+	};
 }
 
 class Schema;

samples/learn/schema/StarWarsSchema.h

@@ -29,15 +29,15 @@ enum class Episode
 	JEDI
 };
 
-constexpr std::array<std::string_view, 3> getEpisodeNames() noexcept
+constexpr auto getEpisodeNames() noexcept
 {
 	using namespace std::literals;
 
-	return { {
+	return std::array<std::string_view, 3> {
 		R"gql(NEW_HOPE)gql"sv,
 		R"gql(EMPIRE)gql"sv,
 		R"gql(JEDI)gql"sv
-	} };
+	};
 }
 
 struct ReviewInput

samples/today/nointrospection/TodaySchema.h

@@ -30,16 +30,16 @@ enum class TaskState
 	Unassigned
 };
 
-constexpr std::array<std::string_view, 4> getTaskStateNames() noexcept
+constexpr auto getTaskStateNames() noexcept
 {
 	using namespace std::literals;
 
-	return { {
+	return std::array<std::string_view, 4> {
 		R"gql(New)gql"sv,
 		R"gql(Started)gql"sv,
 		R"gql(Complete)gql"sv,
 		R"gql(Unassigned)gql"sv
-	} };
+	};
 }
 
 struct CompleteTaskInput

samples/today/schema/TodaySchema.h

@@ -30,16 +30,16 @@ enum class TaskState
 	Unassigned
 };
 
-constexpr std::array<std::string_view, 4> getTaskStateNames() noexcept
+constexpr auto getTaskStateNames() noexcept
 {
 	using namespace std::literals;
 
-	return { {
+	return std::array<std::string_view, 4> {
 		R"gql(New)gql"sv,
 		R"gql(Started)gql"sv,
 		R"gql(Complete)gql"sv,
 		R"gql(Unassigned)gql"sv
-	} };
+	};
 }
 
 struct CompleteTaskInput

samples/validation/schema/ValidationSchema.h

@@ -29,29 +29,29 @@ enum class DogCommand
 	HEEL
 };
 
-constexpr std::array<std::string_view, 3> getDogCommandNames() noexcept
+constexpr auto getDogCommandNames() noexcept
 {
 	using namespace std::literals;
 
-	return { {
+	return std::array<std::string_view, 3> {
 		R"gql(SIT)gql"sv,
 		R"gql(DOWN)gql"sv,
 		R"gql(HEEL)gql"sv
-	} };
+	};
 }
 
 enum class CatCommand
 {
 	JUMP
 };
 
-constexpr std::array<std::string_view, 1> getCatCommandNames() noexcept
+constexpr auto getCatCommandNames() noexcept
 {
 	using namespace std::literals;
 
-	return { {
+	return std::array<std::string_view, 1> {
 		R"gql(JUMP)gql"sv
-	} };
+	};
 }
 
 struct ComplexInput

src/SchemaGenerator.cpp

@@ -175,13 +175,13 @@ static_assert(graphql::internal::MinorVersion == )cpp"
 
 )cpp";
 
-			headerFile << R"cpp(constexpr std::array<std::string_view, )cpp"
-					   << enumType.values.size() << R"cpp(> get)cpp" << enumType.cppType
+			headerFile << R"cpp(constexpr auto get)cpp" << enumType.cppType
 					   << R"cpp(Names() noexcept
 {
 	using namespace std::literals;
 
-	return { {
+	return std::array<std::string_view, )cpp"
+					   << enumType.values.size() << R"cpp(> {
 )cpp";
 
 			firstValue = true;
@@ -199,7 +199,7 @@ static_assert(graphql::internal::MinorVersion == )cpp"
 			}
 
 			headerFile << R"cpp(
-	} };
+	};
 }
 
 )cpp";

src/introspection/IntrospectionSchema.h

@@ -34,11 +34,11 @@ enum class TypeKind
 	NON_NULL
 };
 
-constexpr std::array<std::string_view, 8> getTypeKindNames() noexcept
+constexpr auto getTypeKindNames() noexcept
 {
 	using namespace std::literals;
 
-	return { {
+	return std::array<std::string_view, 8> {
 		R"gql(SCALAR)gql"sv,
 		R"gql(OBJECT)gql"sv,
 		R"gql(INTERFACE)gql"sv,
@@ -47,7 +47,7 @@ constexpr std::array<std::string_view, 8> getTypeKindNames() noexcept
 		R"gql(INPUT_OBJECT)gql"sv,
 		R"gql(LIST)gql"sv,
 		R"gql(NON_NULL)gql"sv
-	} };
+	};
 }
 
 enum class DirectiveLocation
@@ -73,11 +73,11 @@ enum class DirectiveLocation
 	INPUT_FIELD_DEFINITION
 };
 
-constexpr std::array<std::string_view, 19> getDirectiveLocationNames() noexcept
+constexpr auto getDirectiveLocationNames() noexcept
 {
 	using namespace std::literals;
 
-	return { {
+	return std::array<std::string_view, 19> {
 		R"gql(QUERY)gql"sv,
 		R"gql(MUTATION)gql"sv,
 		R"gql(SUBSCRIPTION)gql"sv,
@@ -97,7 +97,7 @@ constexpr std::array<std::string_view, 19> getDirectiveLocationNames() noexcept
 		R"gql(ENUM_VALUE)gql"sv,
 		R"gql(INPUT_OBJECT)gql"sv,
 		R"gql(INPUT_FIELD_DEFINITION)gql"sv
-	} };
+	};
 }
 
 class Schema;