From 189b54cf33ff8e246bf4f857860e3a6904bf4249 Mon Sep 17 00:00:00 2001 From: Rob Mohr Date: Mon, 29 Apr 2024 23:22:12 +0000 Subject: [PATCH] *: Run clang-format MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Iaff1413cc51d9dec4ab97f335d31bf8614d42392 Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/207412 Pigweed-Auto-Submit: Rob Mohr Reviewed-by: Armando Montanez Lint: Lint 🤖 Presubmit-Verified: CQ Bot Account Commit-Queue: Auto-Submit --- pw_containers/inline_deque_test.cc | 4 +++- pw_containers/inline_queue_test.cc | 4 +++- pw_containers/raw_storage_test.cc | 4 +++- pw_containers/vector_test.cc | 12 +++++++++--- pw_log/glog_adapter_test.cc | 8 ++++---- pw_protobuf/encoder_test.cc | 4 +++- pw_protobuf/stream_decoder_test.cc | 12 +++++++++--- .../string_builder_size_report_incremental.cc | 12 ++++++++++-- pw_string/string_builder_test.cc | 4 +++- pw_toolchain/no_destructor_test.cc | 8 ++++++-- pw_trace_tokenized/trace_test.cc | 8 ++++++-- 11 files changed, 59 insertions(+), 21 deletions(-) diff --git a/pw_containers/inline_deque_test.cc b/pw_containers/inline_deque_test.cc index d8c8d87ca..853fe743b 100644 --- a/pw_containers/inline_deque_test.cc +++ b/pw_containers/inline_deque_test.cc @@ -135,7 +135,9 @@ TEST(InlineDeque, Destruct_MultipleEntries) { Counter value; Counter::Reset(); - { InlineDeque deque(100, value); } + { + InlineDeque deque(100, value); + } EXPECT_EQ(Counter::created, 100); EXPECT_EQ(Counter::destroyed, 100); diff --git a/pw_containers/inline_queue_test.cc b/pw_containers/inline_queue_test.cc index 8b8c2098b..a8a7f9576 100644 --- a/pw_containers/inline_queue_test.cc +++ b/pw_containers/inline_queue_test.cc @@ -148,7 +148,9 @@ TEST(InlineQueue, Destruct_MultipleEntries) { Counter value; Counter::Reset(); - { InlineQueue queue(100, value); } + { + InlineQueue queue(100, value); + } EXPECT_EQ(Counter::created, 100); EXPECT_EQ(Counter::destroyed, 100); diff --git a/pw_containers/raw_storage_test.cc b/pw_containers/raw_storage_test.cc index 201b60ad4..2f1c8f16f 100644 --- a/pw_containers/raw_storage_test.cc +++ b/pw_containers/raw_storage_test.cc @@ -55,7 +55,9 @@ TEST(RawStorage, Construct_MoveOnly) { TEST(RawStorage, Destruct) { Counter::Reset(); - { [[maybe_unused]] internal::RawStorage destroyed; } + { + [[maybe_unused]] internal::RawStorage destroyed; + } EXPECT_EQ(Counter::created, 0); EXPECT_EQ(Counter::destroyed, 0); diff --git a/pw_containers/vector_test.cc b/pw_containers/vector_test.cc index bc0d5388b..5ef4650e8 100644 --- a/pw_containers/vector_test.cc +++ b/pw_containers/vector_test.cc @@ -166,7 +166,9 @@ TEST(Vector, Construct_AggregateStringView) { TEST(Vector, Destruct_ZeroLength) { Counter::Reset(); - { Vector destroyed; } + { + Vector destroyed; + } EXPECT_EQ(Counter::created, 0); EXPECT_EQ(Counter::destroyed, 0); } @@ -174,7 +176,9 @@ TEST(Vector, Destruct_ZeroLength) { TEST(Vector, Destruct_Empty) { Counter::Reset(); - { Vector destroyed; } + { + Vector destroyed; + } EXPECT_EQ(Counter::created, 0); EXPECT_EQ(Counter::destroyed, 0); } @@ -183,7 +187,9 @@ TEST(Vector, Destruct_MultpileEntries) { Counter value; Counter::Reset(); - { Vector destroyed(100, value); } + { + Vector destroyed(100, value); + } EXPECT_EQ(Counter::created, 100); EXPECT_EQ(Counter::destroyed, 100); diff --git a/pw_log/glog_adapter_test.cc b/pw_log/glog_adapter_test.cc index eb53f55bf..b75dc88d5 100644 --- a/pw_log/glog_adapter_test.cc +++ b/pw_log/glog_adapter_test.cc @@ -72,8 +72,8 @@ TEST(Glog, Fatal) { TEST(Glog, ConditionalFatal) { conditional = false; - LOG_IF(FATAL, conditional) - << "LOG_IF(FATAL, false) compiles but you should " << "not see this log"; + LOG_IF(FATAL, conditional) << "LOG_IF(FATAL, false) compiles but you should " + << "not see this log"; } TEST(Glog, Dfatal) { @@ -94,8 +94,8 @@ TEST(Glog, ConditionalDfatal) { << "PW_LOG_ERROR as NDEBUG is set"; #endif // defined(NDEBUG) conditional = false; - LOG_IF(DFATAL, conditional) - << "LOG_IF(DFATAL, false) compiles but you " << "should not see this log"; + LOG_IF(DFATAL, conditional) << "LOG_IF(DFATAL, false) compiles but you " + << "should not see this log"; } } // namespace diff --git a/pw_protobuf/encoder_test.cc b/pw_protobuf/encoder_test.cc index eed3c62b3..5b6f77e57 100644 --- a/pw_protobuf/encoder_test.cc +++ b/pw_protobuf/encoder_test.cc @@ -496,7 +496,9 @@ TEST(StreamEncoder, WriteTooBig) { TEST(StreamEncoder, EmptyChildWrites) { std::byte encode_buffer[32]; MemoryEncoder parent(encode_buffer); - { StreamEncoder child = parent.GetNestedEncoder(kTestProtoNestedField); } + { + StreamEncoder child = parent.GetNestedEncoder(kTestProtoNestedField); + } ASSERT_EQ(parent.status(), OkStatus()); const size_t kExpectedSize = varint::EncodedSize( diff --git a/pw_protobuf/stream_decoder_test.cc b/pw_protobuf/stream_decoder_test.cc index 4037065ad..986495ba9 100644 --- a/pw_protobuf/stream_decoder_test.cc +++ b/pw_protobuf/stream_decoder_test.cc @@ -408,7 +408,9 @@ TEST(StreamDecoder, Decode_Nested_SeeksToNextFieldOnDestruction) { // Create a nested encoder for the nested field, but don't use it. EXPECT_EQ(decoder.Next(), OkStatus()); ASSERT_EQ(*decoder.FieldNumber(), 6u); - { StreamDecoder nested = decoder.GetNestedDecoder(); } + { + StreamDecoder nested = decoder.GetNestedDecoder(); + } // The root decoder should still advance to the next field after the nested // decoder is closed. @@ -449,7 +451,9 @@ TEST(StreamDecoder, // Create a nested encoder for the nested field, but don't use it. EXPECT_EQ(decoder.Next(), OkStatus()); ASSERT_EQ(*decoder.FieldNumber(), 6u); - { StreamDecoder nested = decoder.GetNestedDecoder(); } + { + StreamDecoder nested = decoder.GetNestedDecoder(); + } // The root decoder should still advance to the next field after the nested // decoder is closed. @@ -485,7 +489,9 @@ TEST(StreamDecoder, Decode_Nested_LastField) { // the root proto. EXPECT_EQ(decoder.Next(), OkStatus()); ASSERT_EQ(*decoder.FieldNumber(), 6u); - { StreamDecoder nested = decoder.GetNestedDecoder(); } + { + StreamDecoder nested = decoder.GetNestedDecoder(); + } // Root decoder should correctly terminate after the nested decoder is closed. EXPECT_EQ(decoder.Next(), Status::OutOfRange()); diff --git a/pw_string/size_report/string_builder_size_report_incremental.cc b/pw_string/size_report/string_builder_size_report_incremental.cc index f0762145d..87e7da920 100644 --- a/pw_string/size_report/string_builder_size_report_incremental.cc +++ b/pw_string/size_report/string_builder_size_report_incremental.cc @@ -95,7 +95,11 @@ int main() { // Add five strings with either StringBuilder or std::snprintf. FORMAT_STRING("Three", "Three"); FORMAT_STRING("point " << 1, "Three point %d", 1); - FORMAT_STRING("four " << "one" << ' ' << 5u, "four %s %u", "one", 5u); + FORMAT_STRING("four " + << "one" << ' ' << 5u, + "four %s %u", + "one", + 5u); FORMAT_STRING(string, "%s", string); FORMAT_STRING("-->" << string << string << string << ' ' << integer << ' ' << boolean << '!', @@ -109,7 +113,11 @@ int main() { // Add five more strings with either StringBuilder or std::snprintf. FORMAT_STRING("Three", "Three"); FORMAT_STRING("point " << 1, "Three point %d", 1); - FORMAT_STRING("four " << "one" << ' ' << 5u, "four %s %u", "one", 5u); + FORMAT_STRING("four " + << "one" << ' ' << 5u, + "four %s %u", + "one", + 5u); FORMAT_STRING(string, "%s", string); FORMAT_STRING(string << string << string << ' ' << integer << ' ' << boolean, "%s%s%s %d %d", diff --git a/pw_string/string_builder_test.cc b/pw_string/string_builder_test.cc index adccfe3e1..6080dc5ba 100644 --- a/pw_string/string_builder_test.cc +++ b/pw_string/string_builder_test.cc @@ -344,7 +344,9 @@ TEST(StringBuilder, StreamOutput_ExhaustBuffer_InOneString) { EXPECT_STREQ("01234567", sb.data()); // only can fit 8 EXPECT_EQ(8u, sb.size()); - sb << "no" << " more " << "room" << '?'; + sb << "no" + << " more " + << "room" << '?'; EXPECT_STREQ("01234567", sb.data()); } diff --git a/pw_toolchain/no_destructor_test.cc b/pw_toolchain/no_destructor_test.cc index ce315b632..abe758000 100644 --- a/pw_toolchain/no_destructor_test.cc +++ b/pw_toolchain/no_destructor_test.cc @@ -53,11 +53,15 @@ class TrivialDestructor { TEST(NoDestructor, ShouldNotCallDestructor) { bool destructor_called = false; - { HasADestructor should_be_destroyed(destructor_called); } + { + HasADestructor should_be_destroyed(destructor_called); + } EXPECT_TRUE(destructor_called); - { NoDestructor should_not_be_destroyed(destructor_called); } + { + NoDestructor should_not_be_destroyed(destructor_called); + } EXPECT_FALSE(destructor_called); } diff --git a/pw_trace_tokenized/trace_test.cc b/pw_trace_tokenized/trace_test.cc index 8376504fa..a9b847cca 100644 --- a/pw_trace_tokenized/trace_test.cc +++ b/pw_trace_tokenized/trace_test.cc @@ -430,7 +430,9 @@ TEST(TokenizedTrace, DisableAfterTrace) { TEST(TokenizedTrace, Scope) { TraceTestInterface test_interface; - { PW_TRACE_SCOPE("scoped trace"); } + { + PW_TRACE_SCOPE("scoped trace"); + } // Check results EXPECT_TRACE(test_interface, PW_TRACE_TYPE_DURATION_START, "scoped trace"); @@ -441,7 +443,9 @@ TEST(TokenizedTrace, Scope) { TEST(TokenizedTrace, ScopeGroup) { TraceTestInterface test_interface; - { PW_TRACE_SCOPE("scoped group trace", "group"); } + { + PW_TRACE_SCOPE("scoped group trace", "group"); + } // Check results EXPECT_TRACE(test_interface,