cleanup

Author: Tsche

include/rsl/_impl/macro/diagnostic.hpp

@@ -39,7 +39,7 @@
 #  define RSL_DIAGS_literal_suffix "-Wliteral-suffix"
 #  define RSL_DIAGS_narrowing      "-Wnarrowing"
 #elif RSL_COMPILER == RSL_COMPILER_CLANG
-#  define RSL_DIAGS_literal_suffix "-Wliteral-suffix"
+#  define RSL_DIAGS_literal_suffix "-Wuser-defined-literals"
 #  define RSL_DIAGS_narrowing      "-Wc++11-narrowing"
 #else
 #  warning "Unsupported compiler"

include/rsl/meta

@@ -89,7 +89,6 @@ consteval bool has_parent(std::meta::info R) {
   return R != ^^::;
 }
 
-
 consteval std::meta::info get_member_by_name(std::meta::info r, std::string_view name) {
   for (auto member : members_of(r, std::meta::access_context::unprivileged())) {
     if (has_identifier(member) && identifier_of(member) == name) {

include/rsl/tuple

@@ -123,9 +123,6 @@ struct Subscript<T, std::index_sequence<Idx...>> : SubscriptElement<T, Idx>... {
   }
 };
 #endif
-
-template <typename... Ts>
-struct type_list {};
 }  // namespace _tuple_impl
 
 template <class... Types>
@@ -137,12 +134,20 @@ class tuple
 private:
   template <typename... Us>
   constexpr static bool enable_utypes_ctor =
-      !std::same_as<tuple, Us...[0]> && (std::is_constructible_v<Types, Us> && ...);
+      not(sizeof...(Us) == 1 && (std::same_as<tuple, Us> && ...)) &&
+      (std::is_constructible_v<Types, Us> && ...);
 
   template <typename... Us>
   constexpr static bool enable_utypes_tuple_ctor = true;  // TODO
 
+#if $compiler_is(CLANG)
+  // workaround for use as template argument
+  template <typename... Ts>
+  struct Storage;
+  using storage_type = Storage<Types...>;
+#else
   struct storage_type;
+#endif
   consteval {
     std::size_t idx = 0;
     define_aggregate(^^storage_type,
@@ -153,7 +158,7 @@ private:
   constexpr void _impl_copy_assign(this Self& self, T const& other) {
     template for (constexpr auto Idx :
                   $define_static_array(std::views::iota(0ZU, sizeof...(Types)))) {
-      self._impl_storage.[:self._impl_accessor.members[Idx]:]  = other.template get<Idx>();
+      self._impl_storage.[:self._impl_accessor.members[Idx]:] = other.template get<Idx>();
     }
   }
 

test/CMakeLists.txt

@@ -1,15 +1,15 @@
 target_sources(rsl-util-test PRIVATE main.cpp)
 target_include_directories(rsl-util-test PRIVATE ${CMAKE_CURRENT_LIST_DIR})
 
-# add_subdirectory(enum)
-# add_subdirectory(string_view)
-# add_subdirectory(span)
-# add_subdirectory(format)
-# add_subdirectory(expect)
-# add_subdirectory(kwargs)
-# add_subdirectory(tagged_variant)
-# add_subdirectory(variant)
-# add_subdirectory(tuple)
+add_subdirectory(enum)
+add_subdirectory(string_view)
+add_subdirectory(span)
+add_subdirectory(format)
+add_subdirectory(expect)
+add_subdirectory(kwargs)
+add_subdirectory(tagged_variant)
+add_subdirectory(variant)
+add_subdirectory(tuple)
 
 add_subdirectory(serializer)
 # add_subdirectory(trie)

test/tagged_variant/access.cpp

@@ -18,11 +18,11 @@ enum UnscopedEnum {  //
 };
 
 TEST(TaggedVariant, GetTag) {
-  using type = rsl::tagged_variant<ScopedEnum>;
-  type variant{42};
+  using variant_type = rsl::tagged_variant<ScopedEnum>;
+  variant_type variant{42};
   ASSERT_EQ(get_tag<ScopedEnum>(variant), ScopedEnum::INT);
 
-  variant = type{std::in_place_index<2>, false};
+  variant = variant_type{std::in_place_index<2>, false};
   ASSERT_EQ(get_tag<ScopedEnum>(variant), ScopedEnum::BOOL);
 }
 

test/tagged_variant/switch.cpp

@@ -21,18 +21,18 @@ enum UnscopedEnum {  //
 }
 
 TEST(TaggedVariant, Switch) {
-  using type = rsl::tagged_variant<ScopedEnum>;
-  type variant{42};
+  using variant_type = rsl::tagged_variant<ScopedEnum>;
+  variant_type variant{42};
   switch (variant) {
-    using enum type::tags;
+    using enum variant_type::tags;
     case INT:  ASSERT_EQ(get<INT>(variant), 42); break;
     case CHAR: FAIL();
     case BOOL: FAIL();
   }
 
-  variant = type{std::in_place_index<2>, false};
+  variant = variant_type{std::in_place_index<2>, false};
   switch (variant) {
-    using enum type::tags;
+    using enum variant_type::tags;
     case INT:  FAIL();
     case CHAR: FAIL();
     case BOOL: ASSERT_EQ(variant->BOOL, false); break;