From patchwork Wed Mar 22 17:50:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 73596 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp2479962wrt; Wed, 22 Mar 2023 10:57:00 -0700 (PDT) X-Google-Smtp-Source: AK7set+lPuOp3kXwkapeSx1HUZcMpAx1dSnlF6U+a3iI2eA+WrNusScQ+jv2FG+2wcrW4Xwh4BjA X-Received: by 2002:a17:906:5851:b0:931:c99c:480 with SMTP id h17-20020a170906585100b00931c99c0480mr8642036ejs.69.1679507820665; Wed, 22 Mar 2023 10:57:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679507820; cv=none; d=google.com; s=arc-20160816; b=u0QH8WmYtqQUutxeKYWgUEpFfOt5uejCBLBPGXXTRKL6Gx8edN7jC/5Hs2f0HIozPk QZrADqAPXoh0PcFYEixYkkwJJjhzaenrBSUHdfr1xal98Na/Mla1LUj4ExWeGILuRzJj yXbyRKq4OZlVSB/ga+3aP7VVdV5J4WhzhG+IzoT7WK/J1rGE21sSKA61T4q3JP5kNtSe Jo3lm1Vo5UFOY9ifTHRI0JEFafJpaU7eyirOecp3S+JfIxNLJiclx+KjGMCKHo5wBoYL QqiWset04qUkV8zqK3dWK5zBV4jTzxfX1YY2jFbcXIqtWrJZZURtOeQNY1jHx1HCh5iq LOPA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence :content-transfer-encoding:mime-version:message-id:date:subject:to :dmarc-filter:delivered-to:dkim-signature:dkim-filter; bh=yYWhpwUSYQpNWb3U2N2UTlQmlMPRLQnbgwL6aw1pqDI=; b=PgZ5b+ncmKBGt/0bV2ZkPsA55ALkp/0JJcKzN1GGf1ZhANWPfrcN5m4/kMWAticuKy FiI0pJbCJyQJolZbO4JCdvtUKWUCgrQXXQ7Gi0Rnh82f3jkknDREGfuOuCsu0w/hnfvY ph91iTU/gkQ9VK6fi/vhcCDLvd2Ue/cHzGPMcdFqal65ilvoljNZrf4/BTrLxT6LVMdI ASHo9XFY86YHqjyAp+rX4h60Dsbz62b4kI8VvbLXe5eppKYQoxeV80cEWRfeniX4rnjQ 22rad4nHmFOn5AJDpk4htuJXx7RwNj+C4Wg/z15vn7AkOXt24Ll6kKaf7tTD0Q0Y2IRN WZDA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=mKVEG+Mv; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id v20-20020a1709063bd400b0092f55812555si16270553ejf.586.2023.03.22.10.57.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Mar 2023 10:57:00 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=mKVEG+Mv; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id CB530384B0C9 for ; Wed, 22 Mar 2023 17:54:32 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org CB530384B0C9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1679507672; bh=yYWhpwUSYQpNWb3U2N2UTlQmlMPRLQnbgwL6aw1pqDI=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=mKVEG+MvzV1SpYEuzR4gFxmynrJo7Usl9Y3S7Pc1Eyc6xw1FfB1rv+AYQrCVB+3sF hm8s7kEneuO5SrMowiM79bkUE9RyaJE6bsyAelD9ZL6eIrRRxlTY7IlfNdoo9zFeSg CSe1yv+LyLEodUDcQBAxElWqjYrvo9FReurjJdoc= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id EC3E2384783D for ; Wed, 22 Mar 2023 17:50:30 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org EC3E2384783D Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-209-49Ir7vrfPwyvgumL97yg4w-1; Wed, 22 Mar 2023 13:50:27 -0400 X-MC-Unique: 49Ir7vrfPwyvgumL97yg4w-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D6FB7101A531; Wed, 22 Mar 2023 17:50:26 +0000 (UTC) Received: from localhost (unknown [10.33.36.149]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9F0642027040; Wed, 22 Mar 2023 17:50:26 +0000 (UTC) To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed] libstdc++: Remove std::formatter specialization Date: Wed, 22 Mar 2023 17:50:26 +0000 Message-Id: <20230322175026.408061-1-jwakely@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-11.8 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Jonathan Wakely via Gcc-patches From: Jonathan Wakely Reply-To: Jonathan Wakely Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1761091592803715682?= X-GMAIL-MSGID: =?utf-8?q?1761091592803715682?= Tested powerpc64le-linux, pushed to trunk. -- >8-- This was approved in Issaquah as LWG 3833. libstdc++-v3/ChangeLog: * include/std/format (formatter): Do not define partial speclialization, as per LWG 3833. * testsuite/std/format/formatter/requirements.cc: Check it. --- libstdc++-v3/include/std/format | 22 ------------------- .../std/format/formatter/requirements.cc | 9 ++++++++ 2 files changed, 9 insertions(+), 22 deletions(-) diff --git a/libstdc++-v3/include/std/format b/libstdc++-v3/include/std/format index 0e40bce5c15..72b6b450ad1 100644 --- a/libstdc++-v3/include/std/format +++ b/libstdc++-v3/include/std/format @@ -1882,28 +1882,6 @@ namespace __format __format::__formatter_str<_CharT> _M_f; }; - template<__format::__char _CharT, size_t _Nm> - struct formatter - { - formatter() = default; - - [[__gnu__::__always_inline__]] - constexpr typename basic_format_parse_context<_CharT>::iterator - parse(basic_format_parse_context<_CharT>& __pc) - { return _M_f.parse(__pc); } - - template - typename basic_format_context<_Out, _CharT>::iterator - format(const _CharT (&__u)[_Nm], - basic_format_context<_Out, _CharT>& __fc) const - { return _M_f.format({__u, _Nm}, __fc); } - - constexpr void set_debug_format() noexcept { _M_f.set_debug_format(); } - - private: - __format::__formatter_str<_CharT> _M_f; - }; - template struct formatter, char> { diff --git a/libstdc++-v3/testsuite/std/format/formatter/requirements.cc b/libstdc++-v3/testsuite/std/format/formatter/requirements.cc index 3bff8bdbd5d..7d95f7fafe9 100644 --- a/libstdc++-v3/testsuite/std/format/formatter/requirements.cc +++ b/libstdc++-v3/testsuite/std/format/formatter/requirements.cc @@ -51,6 +51,15 @@ test_specializations() // [format.formatter.spec] static_assert( ! std::is_move_constructible_v ); static_assert( ! std::is_copy_assignable_v ); static_assert( ! std::is_move_assignable_v ); + + // LWG 3833. Remove specialization + // template struct formatter + using Farr = std::format_context::formatter_type; + static_assert( ! std::is_default_constructible_v ); + static_assert( ! std::is_copy_constructible_v ); + static_assert( ! std::is_move_constructible_v ); + static_assert( ! std::is_copy_assignable_v ); + static_assert( ! std::is_move_assignable_v ); } int main()