address more comments

Author: huixie90

libcxx/include/__flat_map/flat_map.h

@@ -142,8 +142,12 @@ class flat_map {
     friend flat_map;
 
   public:
-    using iterator_concept  = random_access_iterator_tag;
-    using iterator_category = input_iterator_tag;
+    using iterator_concept = random_access_iterator_tag;
+    // `flat_map::iterator` only satisfy "Cpp17InputIterator" named requirements, because
+    // its `reference` is not a reference type.
+    // However, to avoid surprising runtime behaviour when it is used with the
+    // Cpp17 algorithms or operations, iterator_category is set to random_access_iterator_tag.
+    using iterator_category = random_access_iterator_tag;
     using value_type        = flat_map::value_type;
     using difference_type   = flat_map::difference_type;
 
@@ -482,7 +486,7 @@ class flat_map {
   _LIBCPP_HIDE_FROM_ABI flat_map& operator=(flat_map&& __other) noexcept(
       is_nothrow_move_assignable_v<_KeyContainer> && is_nothrow_move_assignable_v<_MappedContainer> &&
       is_nothrow_move_assignable_v<_Compare>) {
-    auto __clear_other_guard = std::__make_scoped_guard([&]() noexcept { __other.clear() /* noexcept */; });
+    auto __clear_other_guard = std::__make_scope_guard([&]() noexcept { __other.clear() /* noexcept */; });
     auto __clear_self_guard  = std::__make_exception_guard([&]() noexcept { clear() /* noexcept */; });
     __containers_            = std::move(__other.__containers_);
     __compare_               = std::move(__other.__compare_);
@@ -660,7 +664,7 @@ class flat_map {
   }
 
   _LIBCPP_HIDE_FROM_ABI containers extract() && {
-    auto __guard = std::__make_scoped_guard([&]() noexcept { clear() /* noexcept */; });
+    auto __guard = std::__make_scope_guard([&]() noexcept { clear() /* noexcept */; });
     auto __ret   = std::move(__containers_);
     return __ret;
   }

libcxx/include/__utility/exception_guard.h

@@ -138,7 +138,8 @@ _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR __exception_guard<_Rollback> __make_exce
 }
 
 template <class _Rollback>
-_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 __exception_guard_exceptions<_Rollback> __make_scoped_guard(_Rollback __rollback) {
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 __exception_guard_exceptions<_Rollback>
+__make_scope_guard(_Rollback __rollback) {
   return __exception_guard_exceptions<_Rollback>(std::move(__rollback));
 }