address review comments

Author: c8ef

libcxx/include/__algorithm/generate.h

@@ -19,26 +19,22 @@
 
 _LIBCPP_BEGIN_NAMESPACE_STD
 
-namespace __generate {
+template <class _Generator>
+struct __generate_assigner {
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 __generate_assigner(_Generator& __gen) : __gen_(__gen) {}
 
-template <typename _Generator>
-struct __fn {
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 __fn(_Generator& __gen) : __gen_(__gen) {}
-
-  template <typename _Tp>
+  template <class _Tp>
   _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 void operator()(_Tp&& __element) const {
     std::forward<_Tp>(__element) = __gen_();
   }
 
   _Generator& __gen_;
 };
 
-} // namespace __generate
-
 template <class _ForwardIterator, class _Generator>
 inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 void
 generate(_ForwardIterator __first, _ForwardIterator __last, _Generator __gen) {
-  std::for_each(__first, __last, __generate::__fn<_Generator>(__gen));
+  std::for_each(__first, __last, __generate_assigner<_Generator>(__gen));
 }
 
 _LIBCPP_END_NAMESPACE_STD

libcxx/test/std/algorithms/alg.modifying.operations/alg.generate/generate.pass.cpp

@@ -21,35 +21,29 @@
 #include "test_macros.h"
 #include "test_iterators.h"
 
-struct gen_test
-{
-    TEST_CONSTEXPR int operator()() const {return 1;}
+struct gen_test {
+  TEST_CONSTEXPR int operator()() const { return 1; }
 };
 
-
 #if TEST_STD_VER > 17
 TEST_CONSTEXPR bool test_constexpr() {
-    int ia[] = {0, 1, 2, 3, 4};
+  int ia[] = {0, 1, 2, 3, 4};
 
-    std::generate(std::begin(ia), std::end(ia), gen_test());
+  std::generate(std::begin(ia), std::end(ia), gen_test());
 
-    return std::all_of(std::begin(ia), std::end(ia), [](int x) { return x == 1; })
-        ;
-    }
+  return std::all_of(std::begin(ia), std::end(ia), [](int x) { return x == 1; });
+}
 #endif
 
-
 template <class Iter>
-void
-test()
-{
-    const unsigned n = 4;
-    int ia[n] = {0};
-    std::generate(Iter(ia), Iter(ia+n), gen_test());
-    assert(ia[0] == 1);
-    assert(ia[1] == 1);
-    assert(ia[2] == 1);
-    assert(ia[3] == 1);
+void test() {
+  const unsigned n = 4;
+  int ia[n]        = {0};
+  std::generate(Iter(ia), Iter(ia + n), gen_test());
+  assert(ia[0] == 1);
+  assert(ia[1] == 1);
+  assert(ia[2] == 1);
+  assert(ia[3] == 1);
 }
 
 void deque_test() {
@@ -61,16 +55,15 @@ void deque_test() {
   }
 }
 
-int main(int, char**)
-{
-    test<forward_iterator<int*> >();
-    test<bidirectional_iterator<int*> >();
-    test<random_access_iterator<int*> >();
-    test<int*>();
-    deque_test();
+int main(int, char**) {
+  test<forward_iterator<int*> >();
+  test<bidirectional_iterator<int*> >();
+  test<random_access_iterator<int*> >();
+  test<int*>();
+  deque_test();
 
 #if TEST_STD_VER > 17
-    static_assert(test_constexpr());
+  static_assert(test_constexpr());
 #endif
 
   return 0;