Next try

Author: philnik777

libcxx/include/__type_traits/invoke.h

@@ -157,9 +157,7 @@ template <class _Ret, class _Fn, class... _Args>
 inline constexpr bool is_nothrow_invocable_r_v = __is_nothrow_invocable_r_v<_Ret, _Fn, _Args...>;
 
 template <class _Fn, class... _Args>
-struct invoke_result {
-  using type = __invoke_result_t<_Fn, _Args...>;
-};
+struct invoke_result : __invoke_result<_Fn, _Args...> {};
 
 template <class _Fn, class... _Args>
 using invoke_result_t = __invoke_result_t<_Fn, _Args...>;

libcxx/include/__type_traits/is_core_convertible.h

@@ -37,15 +37,13 @@ concept __core_convertible_to = __is_core_convertible<_Tp, _Up>::value;
 
 #endif // _LIBCPP_STD_VER >= 20
 
-template <class _Tp, class _Up, bool = true, bool = __is_core_convertible<_Tp, _Up>::value>
+template <class _Tp, class _Up, bool = __is_core_convertible<_Tp, _Up>::value>
 inline const bool __is_nothrow_core_convertible_v = false;
 
 #ifndef _LIBCPP_CXX03_LANG
 template <class _Tp, class _Up>
-inline const bool __is_nothrow_core_convertible_v<_Tp,
-                                                  _Up,
-                                                  noexcept(static_cast<void (*)(_Up)>(0)(static_cast<_Tp (*)()>(0)())),
-                                                  true> = true;
+inline const bool __is_nothrow_core_convertible_v<_Tp, _Up, true> =
+    noexcept(static_cast<void (*)(_Up) noexcept>(0)(static_cast<_Tp (*)() noexcept>(0)()));
 #endif
 
 _LIBCPP_END_NAMESPACE_STD