Adjust templatization

Author: frederick-vs-ja

stl/inc/__msvc_formatter.hpp

@@ -421,7 +421,8 @@ _NODISCARD _FormatContext::iterator _Fill_align_and_width_formatter_format(_Form
 template <class _CharT>
 struct _Fill_align_and_width_formatter {
 public:
-    _NODISCARD constexpr auto _Parse(basic_format_parse_context<_CharT>& _Parse_ctx) {
+    template <class _ParserContext = basic_format_parse_context<_CharT>> // improves throughput, see GH-5003
+    _NODISCARD constexpr _ParserContext::iterator _Parse(type_identity_t<_ParserContext&> _Parse_ctx) {
         return _STD _Fill_align_and_width_formatter_parse(_Specs, _Parse_ctx);
     }
 

stl/inc/stacktrace

@@ -341,8 +341,8 @@ ostream& operator<<(ostream& _Os, const basic_stacktrace<_Alloc>& _St) {
 
 template <>
 struct formatter<stacktrace_entry> {
-    template <class _ParseContext = format_parse_context> // improves throughput, see GH-5003
-    constexpr _ParseContext::iterator parse(type_identity_t<_ParseContext&> _Parse_ctx) {
+    template <class _ParserContext = format_parse_context> // improves throughput, see GH-5003
+    constexpr _ParserContext::iterator parse(type_identity_t<_ParserContext&> _Parse_ctx) {
         return _Impl._Parse(_Parse_ctx);
     }
 
@@ -362,8 +362,7 @@ inline constexpr bool enable_nonlocking_formatter_optimization<stacktrace_entry>
 
 template <class _Alloc>
 struct formatter<basic_stacktrace<_Alloc>> {
-    template <class _ParseContext = format_parse_context> // improves throughput, see GH-5003
-    constexpr _ParseContext::iterator parse(type_identity_t<_ParseContext&> _Parse_ctx) {
+    constexpr format_parse_context::iterator parse(format_parse_context& _Parse_ctx) {
         const auto _First = _Parse_ctx.begin();
         if (_First != _Parse_ctx.end() && *_First != '}') {
             _Throw_format_error("For formatter<basic_stacktrace<Allocator>>, format-spec must be empty.");