clang-format: re-format for clang-18
clang-format-18 isn't compatible with the clang-format-17 output, so we
need to reformat the code with the latest version. The way clang-18
handles lambda formatting also changed, so we have made changes to the
organization default style format to better handle lambda formatting.
See I5e08687e696dd240402a2780158664b7113def0e for updated style.
See Iea0776aaa7edd483fa395e23de25ebf5a6288f71 for clang-18 enablement.
Change-Id: I07372e75f12f406bd0555dd27e249bc7dd0958d4
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
diff --git a/src/test/erase/pattern_test.cpp b/src/test/erase/pattern_test.cpp
index bccbd37..6a475d5 100644
--- a/src/test/erase/pattern_test.cpp
+++ b/src/test/erase/pattern_test.cpp
@@ -112,41 +112,47 @@
// test write pattern with short blocks
EXPECT_CALL(mock, write(_))
.WillOnce(Invoke([](std::span<const std::byte> x) {
- std::copy_n(x.begin(), shortData1.size(), shortData1.begin());
- return shortData1;
- })).RetiresOnSaturation();
+ std::copy_n(x.begin(), shortData1.size(), shortData1.begin());
+ return shortData1;
+ }))
+ .RetiresOnSaturation();
EXPECT_CALL(mock, write(_))
.WillOnce(Invoke([](std::span<const std::byte> x) {
- std::copy_n(x.begin(), restOfData.size(), restOfData.begin());
- return restOfData;
- })).RetiresOnSaturation();
+ std::copy_n(x.begin(), restOfData.size(), restOfData.begin());
+ return restOfData;
+ }))
+ .RetiresOnSaturation();
EXPECT_CALL(mock, write(_))
.WillOnce(Invoke([](std::span<const std::byte> x) {
- std::copy_n(x.begin(), shortData2.size(), shortData2.begin());
- return shortData2;
- })).RetiresOnSaturation();
+ std::copy_n(x.begin(), shortData2.size(), shortData2.begin());
+ return shortData2;
+ }))
+ .RetiresOnSaturation();
// test read pattern
EXPECT_CALL(mock, read(_))
.WillOnce(Invoke([](std::span<std::byte> x) {
- std::copy_n(shortData1.begin(), shortData1.size(), x.data());
- std::span ret(shortData1);
- return ret;
- })).RetiresOnSaturation();
+ std::copy_n(shortData1.begin(), shortData1.size(), x.data());
+ std::span ret(shortData1);
+ return ret;
+ }))
+ .RetiresOnSaturation();
EXPECT_CALL(mock, read(_))
.WillOnce(Invoke([](std::span<std::byte> x) {
- std::copy_n(restOfData.begin(), restOfData.size(), x.data());
- std::span ret(restOfData);
- return ret;
- })).RetiresOnSaturation();
+ std::copy_n(restOfData.begin(), restOfData.size(), x.data());
+ std::span ret(restOfData);
+ return ret;
+ }))
+ .RetiresOnSaturation();
EXPECT_CALL(mock, read(_))
.WillOnce(Invoke([](std::span<std::byte> x) {
- std::copy_n(shortData2.begin(), shortData2.size(), x.data());
- std::span ret(shortData2);
- return ret;
- })).RetiresOnSaturation();
+ std::copy_n(shortData2.begin(), shortData2.size(), x.data());
+ std::span ret(shortData2);
+ return ret;
+ }))
+ .RetiresOnSaturation();
EXPECT_NO_THROW(pass.writePattern(size, mock));
EXPECT_NO_THROW(pass.verifyPattern(size, mock));
@@ -160,8 +166,8 @@
size_t shortSize = 128;
Pattern tryPattern(testFileName);
auto shortData = std::vector<std::byte>(shortSize, std::byte{0});
- auto restOfData = std::vector<std::byte>(size - shortSize * 3,
- std::byte{0});
+ auto restOfData =
+ std::vector<std::byte>(size - shortSize * 3, std::byte{0});
std::span shortDataSpan{shortData};
std::span restOfDataSpan{restOfData};
// open the file and write none to it