commit fc320fb34fb7d0b5acf95dce4e403f3e50db9c11
author Daniel McIntosh <Daniel.McIntosh@ibm.com> Thu Oct 07 17:32:09 2021 -0400
committer Copybara-Service <copybara-worker@google.com> Thu Nov 11 11:50:56 2021 -0800
tree 8141fdc20fd2f6d4aa09a733a724637110b769b6
parent a54b1afe7d24cd7170c78266e47b7bbd8f776480

[libcxx][format] Fix how we handle char traits in formatter<string> and formatter<string_view>

Right now we drop the char_traits template argument, which presumes that
string<_CharT, _Traits> and string<_CharT> are interchangeable.

Reviewed By: Mordante, #libc, Quuxplusone

Differential Revision: https://reviews.llvm.org/D112017

GitOrigin-RevId: 75ecd1f38c6feab159034dc3bbf30aaaf72bbac2

include/__format/formatter_string.h

diff --git a/include/__format/formatter_string.h b/include/__format/formatter_string.h
index 45d1147..2be36a1 100644
--- a/include/__format/formatter_string.h
+++ b/include/__format/formatter_string.h
@@ -119,7 +119,7 @@
 
   _LIBCPP_HIDE_FROM_ABI auto format(const _CharT __str[_Size], auto& __ctx)
       -> decltype(__ctx.out()) {
-    return _Base::format(_VSTD::basic_string_view<_CharT>(__str, _Size), __ctx);
+    return _Base::format(basic_string_view<_CharT>(__str, _Size), __ctx);
   }
 };
 
@@ -133,15 +133,24 @@
   _LIBCPP_HIDE_FROM_ABI auto
   format(const basic_string<_CharT, _Traits, _Allocator>& __str, auto& __ctx)
       -> decltype(__ctx.out()) {
-    return _Base::format(_VSTD::basic_string_view<_CharT>(__str), __ctx);
+    // drop _Traits and _Allocator
+    return _Base::format(basic_string_view<_CharT>(__str.data(), __str.size()), __ctx);
   }
 };
 
 // Formatter std::string_view.
 template <class _CharT, class _Traits>
-struct _LIBCPP_TEMPLATE_VIS _LIBCPP_AVAILABILITY_FORMAT
-    formatter<basic_string_view<_CharT, _Traits>, _CharT>
-    : public __format_spec::__formatter_string<_CharT> {};
+struct _LIBCPP_TEMPLATE_VIS _LIBCPP_AVAILABILITY_FORMAT formatter<basic_string_view<_CharT, _Traits>, _CharT>
+    : public __format_spec::__formatter_string<_CharT> {
+  using _Base = __format_spec::__formatter_string<_CharT>;
+
+  _LIBCPP_HIDE_FROM_ABI auto
+  format(basic_string_view<_CharT, _Traits> __str, auto& __ctx)
+      -> decltype(__ctx.out()) {
+    // drop _Traits
+    return _Base::format(basic_string_view<_CharT>(__str.data(), __str.size()), __ctx);
+  }
+};
 
 #endif // !defined(_LIBCPP_HAS_NO_CONCEPTS)