[libcxx-commits] [libcxx] c20d81b - [libc++] Add missing [[maybe_unused]] attribute in format tests

[Louis Dionne via libcxx-commits]

Author: Louis Dionne
Date: 2023-06-20T11:25:01-04:00
New Revision: c20d81bd63b0cf1060f85c749581d023de2a9211

URL: https://github.com/llvm/llvm-project/commit/c20d81bd63b0cf1060f85c749581d023de2a9211
DIFF: https://github.com/llvm/llvm-project/commit/c20d81bd63b0cf1060f85c749581d023de2a9211.diff

LOG: [libc++] Add missing [[maybe_unused]] attribute in format tests

Otherwise, Clang complains about format_ctx being unused in the tests
when exceptions are disabled in Freestanding mode. I don't know why it
doesn't complain not in freestanding mode.

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

Added: 
    

Modified: 
    libcxx/test/std/utilities/format/format.range/format.range.fmtdef/format.pass.cpp
    libcxx/test/std/utilities/format/format.range/format.range.fmtmap/format.pass.cpp
    libcxx/test/std/utilities/format/format.range/format.range.fmtset/format.pass.cpp
    libcxx/test/std/utilities/format/format.range/format.range.formatter/format.pass.cpp
    libcxx/test/std/utilities/format/format.tuple/format.pass.cpp

Removed: 
    


################################################################################
diff  --git a/libcxx/test/std/utilities/format/format.range/format.range.fmtdef/format.pass.cpp b/libcxx/test/std/utilities/format/format.range/format.range.fmtdef/format.pass.cpp
index fe005b68d3d90..75d227b4335db 100644
--- a/libcxx/test/std/utilities/format/format.range/format.range.fmtdef/format.pass.cpp
+++ b/libcxx/test/std/utilities/format/format.range/format.range.fmtdef/format.pass.cpp
@@ -74,8 +74,9 @@ void test_assure_parse_is_called() {
   std::array<parse_call_validator, 2> arg;
 
   String result;
-  OutIt out             = std::back_inserter(result);
-  FormatCtxT format_ctx = test_format_context_create<OutIt, CharT>(out, std::make_format_args<FormatCtxT>(arg));
+  OutIt out = std::back_inserter(result);
+  [[maybe_unused]] FormatCtxT format_ctx =
+      test_format_context_create<OutIt, CharT>(out, std::make_format_args<FormatCtxT>(arg));
 
   { // parse not called
     [[maybe_unused]] const std::formatter<decltype(arg), CharT> formatter;

diff  --git a/libcxx/test/std/utilities/format/format.range/format.range.fmtmap/format.pass.cpp b/libcxx/test/std/utilities/format/format.range/format.range.fmtmap/format.pass.cpp
index 035ed254cb415..a7dc5e930d5af 100644
--- a/libcxx/test/std/utilities/format/format.range/format.range.fmtmap/format.pass.cpp
+++ b/libcxx/test/std/utilities/format/format.range/format.range.fmtmap/format.pass.cpp
@@ -77,8 +77,9 @@ void test_assure_parse_is_called() {
   std::map<parse_call_validator, parse_call_validator> arg{{parse_call_validator{}, parse_call_validator{}}};
 
   String result;
-  OutIt out             = std::back_inserter(result);
-  FormatCtxT format_ctx = test_format_context_create<OutIt, CharT>(out, std::make_format_args<FormatCtxT>(arg));
+  OutIt out = std::back_inserter(result);
+  [[maybe_unused]] FormatCtxT format_ctx =
+      test_format_context_create<OutIt, CharT>(out, std::make_format_args<FormatCtxT>(arg));
 
   { // parse not called
     [[maybe_unused]] const std::formatter<decltype(arg), CharT> formatter;

diff  --git a/libcxx/test/std/utilities/format/format.range/format.range.fmtset/format.pass.cpp b/libcxx/test/std/utilities/format/format.range/format.range.fmtset/format.pass.cpp
index 550ac4f573776..5b94aa0ef4481 100644
--- a/libcxx/test/std/utilities/format/format.range/format.range.fmtset/format.pass.cpp
+++ b/libcxx/test/std/utilities/format/format.range/format.range.fmtset/format.pass.cpp
@@ -77,8 +77,9 @@ void test_assure_parse_is_called() {
   std::set<parse_call_validator> arg{parse_call_validator{}};
 
   String result;
-  OutIt out             = std::back_inserter(result);
-  FormatCtxT format_ctx = test_format_context_create<OutIt, CharT>(out, std::make_format_args<FormatCtxT>(arg));
+  OutIt out = std::back_inserter(result);
+  [[maybe_unused]] FormatCtxT format_ctx =
+      test_format_context_create<OutIt, CharT>(out, std::make_format_args<FormatCtxT>(arg));
 
   { // parse not called
     [[maybe_unused]] const std::formatter<decltype(arg), CharT> formatter;

diff  --git a/libcxx/test/std/utilities/format/format.range/format.range.formatter/format.pass.cpp b/libcxx/test/std/utilities/format/format.range/format.range.formatter/format.pass.cpp
index b3ef1b386a5f6..858952263b8ed 100644
--- a/libcxx/test/std/utilities/format/format.range/format.range.formatter/format.pass.cpp
+++ b/libcxx/test/std/utilities/format/format.range/format.range.formatter/format.pass.cpp
@@ -78,8 +78,9 @@ void test_assure_parse_is_called() {
   std::vector<parse_call_validator> arg{1};
 
   String result;
-  OutIt out             = std::back_inserter(result);
-  FormatCtxT format_ctx = test_format_context_create<OutIt, CharT>(out, std::make_format_args<FormatCtxT>(arg));
+  OutIt out = std::back_inserter(result);
+  [[maybe_unused]] FormatCtxT format_ctx =
+      test_format_context_create<OutIt, CharT>(out, std::make_format_args<FormatCtxT>(arg));
 
   { // parse not called
     [[maybe_unused]] const std::range_formatter<parse_call_validator, CharT> formatter;

diff  --git a/libcxx/test/std/utilities/format/format.tuple/format.pass.cpp b/libcxx/test/std/utilities/format/format.tuple/format.pass.cpp
index f68bbedb3715e..d83139bf2f952 100644
--- a/libcxx/test/std/utilities/format/format.tuple/format.pass.cpp
+++ b/libcxx/test/std/utilities/format/format.tuple/format.pass.cpp
@@ -78,8 +78,9 @@ void test_assure_parse_is_called() {
   std::pair<parse_call_validator, parse_call_validator> arg;
 
   String result;
-  OutIt out             = std::back_inserter(result);
-  FormatCtxT format_ctx = test_format_context_create<OutIt, CharT>(out, std::make_format_args<FormatCtxT>(arg));
+  OutIt out = std::back_inserter(result);
+  [[maybe_unused]] FormatCtxT format_ctx =
+      test_format_context_create<OutIt, CharT>(out, std::make_format_args<FormatCtxT>(arg));
 
   { // parse not called
     [[maybe_unused]] const std::formatter<decltype(arg), CharT> formatter;