From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id 7597A3858C2C for ; Mon, 28 Mar 2022 11:21:07 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 7597A3858C2C 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-22-EpRFOVXZPXmUYmEK3YSYOA-1; Mon, 28 Mar 2022 07:21:03 -0400 X-MC-Unique: EpRFOVXZPXmUYmEK3YSYOA-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 94469811E78; Mon, 28 Mar 2022 11:21:03 +0000 (UTC) Received: from localhost (unknown [10.33.36.3]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5A5D542D3C9; Mon, 28 Mar 2022 11:21:03 +0000 (UTC) From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed] libstdc++: Fix typos in comments in tests Date: Mon, 28 Mar 2022 12:21:02 +0100 Message-Id: <20220328112102.1492603-1-jwakely@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.9 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-Spam-Status: No, score=-12.6 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_LOW, RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: libstdc++@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++ mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Mar 2022 11:21:12 -0000 Tested x86_64-linux, pushed to trunk. -- >8 -- libstdc++-v3/ChangeLog: * testsuite/20_util/optional/monadic/and_then.cc: Fix typo. * testsuite/20_util/optional/monadic/transform.cc: Likewise. * testsuite/22_locale/codecvt/always_noconv/char/1.cc: Likewise. * testsuite/22_locale/codecvt/encoding/char/1.cc: Likewise. * testsuite/22_locale/codecvt/in/char/1.cc: Likewise. * testsuite/22_locale/codecvt/max_length/char/1.cc: Likewise. * testsuite/22_locale/codecvt/out/char/1.cc: Likewise. * testsuite/22_locale/codecvt/unshift/char/1.cc: Likewise. --- .../testsuite/20_util/optional/monadic/and_then.cc | 2 +- .../testsuite/20_util/optional/monadic/transform.cc | 2 +- .../22_locale/codecvt/always_noconv/char/1.cc | 4 ++-- .../testsuite/22_locale/codecvt/encoding/char/1.cc | 4 ++-- .../testsuite/22_locale/codecvt/in/char/1.cc | 8 ++++---- .../testsuite/22_locale/codecvt/max_length/char/1.cc | 4 ++-- .../testsuite/22_locale/codecvt/out/char/1.cc | 8 ++++---- .../testsuite/22_locale/codecvt/unshift/char/1.cc | 12 ++++++------ 8 files changed, 22 insertions(+), 22 deletions(-) diff --git a/libstdc++-v3/testsuite/20_util/optional/monadic/and_then.cc b/libstdc++-v3/testsuite/20_util/optional/monadic/and_then.cc index f69ab952643..7cbec330ea0 100644 --- a/libstdc++-v3/testsuite/20_util/optional/monadic/and_then.cc +++ b/libstdc++-v3/testsuite/20_util/optional/monadic/and_then.cc @@ -118,7 +118,7 @@ void f(int&) { } void test_unconstrained() { - // PR libstc++/102863 - Optional monadic ops should not be constrained + // PR libstdc++/102863 - Optional monadic ops should not be constrained std::optional x; auto answer = x.and_then([](auto& y) { f(y); return std::optional{42}; }); VERIFY( !answer ); diff --git a/libstdc++-v3/testsuite/20_util/optional/monadic/transform.cc b/libstdc++-v3/testsuite/20_util/optional/monadic/transform.cc index 356c94de6d0..b08837ee03b 100644 --- a/libstdc++-v3/testsuite/20_util/optional/monadic/transform.cc +++ b/libstdc++-v3/testsuite/20_util/optional/monadic/transform.cc @@ -137,7 +137,7 @@ void f(int&) { } void test_unconstrained() { - // PR libstc++/102863 - Optional monadic ops should not be constrained + // PR libstdc++/102863 - Optional monadic ops should not be constrained std::optional x; auto answer = x.transform([](auto& y) { f(y); return 42; }); VERIFY( !answer ); diff --git a/libstdc++-v3/testsuite/22_locale/codecvt/always_noconv/char/1.cc b/libstdc++-v3/testsuite/22_locale/codecvt/always_noconv/char/1.cc index 9431c90b10e..c169073fb46 100644 --- a/libstdc++-v3/testsuite/22_locale/codecvt/always_noconv/char/1.cc +++ b/libstdc++-v3/testsuite/22_locale/codecvt/always_noconv/char/1.cc @@ -36,9 +36,9 @@ void test01() char* c_ref = new char[size]; locale loc = locale::classic(); - const c_codecvt* cvt = &use_facet(loc); + const c_codecvt* cvt = &use_facet(loc); - // According to the resolution of DR19 (see also libstd++/9168), in + // According to the resolution of DR19 (see also libstdc++/9168), in // case of degenerate conversion ('noconv'), "there are no changes to // the values in [to, to_limit)." memset(c_ref, 'X', size); diff --git a/libstdc++-v3/testsuite/22_locale/codecvt/encoding/char/1.cc b/libstdc++-v3/testsuite/22_locale/codecvt/encoding/char/1.cc index a8e86524e06..f5e0541a879 100644 --- a/libstdc++-v3/testsuite/22_locale/codecvt/encoding/char/1.cc +++ b/libstdc++-v3/testsuite/22_locale/codecvt/encoding/char/1.cc @@ -36,9 +36,9 @@ void test01() char* c_ref = new char[size]; locale loc = locale::classic(); - const c_codecvt* cvt = &use_facet(loc); + const c_codecvt* cvt = &use_facet(loc); - // According to the resolution of DR19 (see also libstd++/9168), in + // According to the resolution of DR19 (see also libstdc++/9168), in // case of degenerate conversion ('noconv'), "there are no changes to // the values in [to, to_limit)." memset(c_ref, 'X', size); diff --git a/libstdc++-v3/testsuite/22_locale/codecvt/in/char/1.cc b/libstdc++-v3/testsuite/22_locale/codecvt/in/char/1.cc index 42bb7bc8578..299c62a8cc6 100644 --- a/libstdc++-v3/testsuite/22_locale/codecvt/in/char/1.cc +++ b/libstdc++-v3/testsuite/22_locale/codecvt/in/char/1.cc @@ -40,19 +40,19 @@ void test01() locale loc = locale::classic(); c_codecvt::state_type state; - const c_codecvt* cvt = &use_facet(loc); + const c_codecvt* cvt = &use_facet(loc); - // According to the resolution of DR19 (see also libstd++/9168), in + // According to the resolution of DR19 (see also libstdc++/9168), in // case of degenerate conversion ('noconv'), "there are no changes to // the values in [to, to_limit)." memset(c_ref, 'X', size); // in memset(c_arr, 'X', size); - result r1 = cvt->in(state, c_lit, c_lit + size, from_next, + result r1 = cvt->in(state, c_lit, c_lit + size, from_next, c_arr, c_arr + size, to_next); VERIFY( r1 == codecvt_base::noconv ); - VERIFY( !memcmp(c_arr, c_ref, size) ); + VERIFY( !memcmp(c_arr, c_ref, size) ); VERIFY( from_next == c_lit ); VERIFY( to_next == c_arr ); diff --git a/libstdc++-v3/testsuite/22_locale/codecvt/max_length/char/1.cc b/libstdc++-v3/testsuite/22_locale/codecvt/max_length/char/1.cc index 0236ac35293..5aec13726da 100644 --- a/libstdc++-v3/testsuite/22_locale/codecvt/max_length/char/1.cc +++ b/libstdc++-v3/testsuite/22_locale/codecvt/max_length/char/1.cc @@ -35,9 +35,9 @@ void test01() char* c_arr = new char[size]; char* c_ref = new char[size]; locale loc = locale::classic(); - const c_codecvt* cvt = &use_facet(loc); + const c_codecvt* cvt = &use_facet(loc); - // According to the resolution of DR19 (see also libstd++/9168), in + // According to the resolution of DR19 (see also libstdc++/9168), in // case of degenerate conversion ('noconv'), "there are no changes to // the values in [to, to_limit)." memset(c_ref, 'X', size); diff --git a/libstdc++-v3/testsuite/22_locale/codecvt/out/char/1.cc b/libstdc++-v3/testsuite/22_locale/codecvt/out/char/1.cc index 5733df674aa..a2224c71e54 100644 --- a/libstdc++-v3/testsuite/22_locale/codecvt/out/char/1.cc +++ b/libstdc++-v3/testsuite/22_locale/codecvt/out/char/1.cc @@ -40,19 +40,19 @@ void test01() locale loc = locale::classic(); c_codecvt::state_type state; - const c_codecvt* cvt = &use_facet(loc); + const c_codecvt* cvt = &use_facet(loc); - // According to the resolution of DR19 (see also libstd++/9168), in + // According to the resolution of DR19 (see also libstdc++/9168), in // case of degenerate conversion ('noconv'), "there are no changes to // the values in [to, to_limit)." memset(c_ref, 'X', size); // out memset(c_arr, 'X', size); - result r2 = cvt->out(state, c_lit, c_lit + size, from_next, + result r2 = cvt->out(state, c_lit, c_lit + size, from_next, c_arr, c_arr + size, to_next); VERIFY( r2 == codecvt_base::noconv ); - VERIFY( !memcmp(c_arr, c_ref, size) ); + VERIFY( !memcmp(c_arr, c_ref, size) ); VERIFY( from_next == c_lit ); VERIFY( to_next == c_arr ); diff --git a/libstdc++-v3/testsuite/22_locale/codecvt/unshift/char/1.cc b/libstdc++-v3/testsuite/22_locale/codecvt/unshift/char/1.cc index 828fcec46d3..28745ce9eed 100644 --- a/libstdc++-v3/testsuite/22_locale/codecvt/unshift/char/1.cc +++ b/libstdc++-v3/testsuite/22_locale/codecvt/unshift/char/1.cc @@ -40,28 +40,28 @@ void test01() locale loc = locale::classic(); c_codecvt::state_type state; - const c_codecvt* cvt = &use_facet(loc); + const c_codecvt* cvt = &use_facet(loc); - // According to the resolution of DR19 (see also libstd++/9168), in + // According to the resolution of DR19 (see also libstdc++/9168), in // case of degenerate conversion ('noconv'), "there are no changes to // the values in [to, to_limit)." memset(c_ref, 'X', size); // in memset(c_arr, 'X', size); - result r1 = cvt->in(state, c_lit, c_lit + size, from_next, + result r1 = cvt->in(state, c_lit, c_lit + size, from_next, c_arr, c_arr + size, to_next); VERIFY( r1 == codecvt_base::noconv ); - VERIFY( !memcmp(c_arr, c_ref, size) ); + VERIFY( !memcmp(c_arr, c_ref, size) ); VERIFY( from_next == c_lit ); VERIFY( to_next == c_arr ); // out memset(c_arr, 'X', size); - result r2 = cvt->out(state, c_lit, c_lit + size, from_next, + result r2 = cvt->out(state, c_lit, c_lit + size, from_next, c_arr, c_arr + size, to_next); VERIFY( r2 == codecvt_base::noconv ); - VERIFY( !memcmp(c_arr, c_ref, size) ); + VERIFY( !memcmp(c_arr, c_ref, size) ); VERIFY( from_next == c_lit ); VERIFY( to_next == c_arr ); -- 2.34.1