pw_base64/pw_i2c/pw_tokenizer: Inclusive language Change-Id: I3a10d0a20aef9b3c671587d9143264c2a8ed06ae Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/48562 Pigweed-Auto-Submit: Rob Mohr <mohrr@google.com> Commit-Queue: Auto-Submit <auto-submit@pigweed.google.com.iam.gserviceaccount.com> Reviewed-by: Joe Ethier <jethier@google.com>
diff --git a/pw_base64/base64_test.cc b/pw_base64/base64_test.cc index 17e5348..32f7d7b 100644 --- a/pw_base64/base64_test.cc +++ b/pw_base64/base64_test.cc
@@ -183,7 +183,7 @@ {4, "\x77\xe1\x63\x51", "d+FjUQ=="}, {4, "\x7d\xa6\x8c\x5e", "faaMXg=="}, {5, "\x6e\xb8\x91\x3f\xac", "briRP6w="}, - {5, "\xd1\x16\x7f\x1d\xef", "0RZ/He8="}, + {5, "\xd1\x16\x7f\x1d\xef", "0RZ/He8="}, // inclusive-language: ignore {5, "\x42\x95\xfb\x24\xee", "QpX7JO4="}, {5, "\x19\xfd\xe5\x96\xc1", "Gf3llsE="}, {5, "\x42\x5a\xb3\xfe\x13", "Qlqz/hM="},
diff --git a/pw_i2c/device_test.cc b/pw_i2c/device_test.cc index 00b4829..dea5b1e 100644 --- a/pw_i2c/device_test.cc +++ b/pw_i2c/device_test.cc
@@ -41,10 +41,10 @@ // This test just checks to make sure the Device object compiles. // TODO(b/185609270): Full test coverage. TEST(DeviceCompilationTest, CompileOk) { - constexpr Address kDummyDeviceAddress = Address::SevenBit<0x3F>(); + constexpr Address kTestDeviceAddress = Address::SevenBit<0x3F>(); TestInitiator initiator; - Device device = Device(initiator, kDummyDeviceAddress); + Device device = Device(initiator, kTestDeviceAddress); } } // namespace
diff --git a/pw_i2c/register_device_test.cc b/pw_i2c/register_device_test.cc index bfa038c..1d2ff7c 100644 --- a/pw_i2c/register_device_test.cc +++ b/pw_i2c/register_device_test.cc
@@ -25,7 +25,7 @@ using namespace std::literals::chrono_literals; constexpr uint8_t kErrorValue = 0x11; -constexpr Address kDummyDeviceAddress = Address::SevenBit<0x3F>(); +constexpr Address kTestDeviceAddress = Address::SevenBit<0x3F>(); constexpr chrono::SystemClock::duration kTimeout = std::chrono::duration_cast<chrono::SystemClock::duration>(100ms); @@ -70,7 +70,7 @@ TEST(RegisterDevice, Construction) { TestInitiator initiator; RegisterDevice device(initiator, - kDummyDeviceAddress, + kTestDeviceAddress, std::endian::little, RegisterAddressSize::k1Byte); } @@ -78,7 +78,7 @@ TEST(RegisterDevice, WriteRegisters8With2RegistersAnd1ByteAddress) { TestInitiator initiator; RegisterDevice device(initiator, - kDummyDeviceAddress, + kTestDeviceAddress, std::endian::little, RegisterAddressSize::k1Byte); @@ -107,7 +107,7 @@ TEST(RegisterDevice, WriteRegisters8With2RegistersAnd2ByteAddress) { TestInitiator initiator; RegisterDevice device(initiator, - kDummyDeviceAddress, + kTestDeviceAddress, std::endian::little, RegisterAddressSize::k2Bytes); @@ -137,7 +137,7 @@ TEST(RegisterDevice, WriteRegisters16With2RegistersAnd2ByteAddress) { TestInitiator initiator; RegisterDevice device(initiator, - kDummyDeviceAddress, + kTestDeviceAddress, std::endian::little, RegisterAddressSize::k2Bytes); @@ -172,7 +172,7 @@ TEST(RegisterDevice, WriteRegisters16With2RegistersAnd2ByteAddressBigEndian) { TestInitiator initiator; RegisterDevice device(initiator, - kDummyDeviceAddress, + kTestDeviceAddress, std::endian::big, RegisterAddressSize::k2Bytes); @@ -209,7 +209,7 @@ TEST(RegisterDevice, WriteRegisters8BufferTooSmall) { TestInitiator initiator; RegisterDevice device(initiator, - kDummyDeviceAddress, + kTestDeviceAddress, std::endian::little, RegisterAddressSize::k2Bytes); @@ -224,7 +224,7 @@ TEST(RegisterDevice, WriteRegister16With1ByteAddress) { TestInitiator initiator; RegisterDevice device(initiator, - kDummyDeviceAddress, + kTestDeviceAddress, std::endian::little, RegisterAddressSize::k1Byte); @@ -253,7 +253,7 @@ TEST(RegisterDevice, WriteRegister32With1ByteAddress) { TestInitiator initiator; RegisterDevice device(initiator, - kDummyDeviceAddress, + kTestDeviceAddress, std::endian::little, RegisterAddressSize::k1Byte); @@ -282,7 +282,7 @@ TEST(RegisterDevice, WriteRegister16with2ByteAddress) { TestInitiator initiator; RegisterDevice device(initiator, - kDummyDeviceAddress, + kTestDeviceAddress, std::endian::little, RegisterAddressSize::k2Bytes); @@ -312,7 +312,7 @@ TEST(RegisterDevice, WriteRegister16With1ByteAddressAndBigEndian) { TestInitiator initiator; RegisterDevice device(initiator, - kDummyDeviceAddress, + kTestDeviceAddress, std::endian::big, RegisterAddressSize::k1Byte); @@ -342,7 +342,7 @@ TEST(RegisterDevice, WriteRegister32With1ByteAddressAndBigEndian) { TestInitiator initiator; RegisterDevice device(initiator, - kDummyDeviceAddress, + kTestDeviceAddress, std::endian::big, RegisterAddressSize::k1Byte); @@ -372,7 +372,7 @@ TEST(RegisterDevice, WriteRegister16With2ByteAddressAndBigEndian) { TestInitiator initiator; RegisterDevice device(initiator, - kDummyDeviceAddress, + kTestDeviceAddress, std::endian::big, RegisterAddressSize::k2Bytes); @@ -404,7 +404,7 @@ TEST(RegisterDevice, ReadRegisters8ByteWith2RegistersAnd1ByteAddress) { TestInitiator initiator; RegisterDevice device(initiator, - kDummyDeviceAddress, + kTestDeviceAddress, std::endian::little, RegisterAddressSize::k1Byte); @@ -434,7 +434,7 @@ TEST(RegisterDevice, ReadRegisters8IntWith2RegistersAnd1ByteAddress) { TestInitiator initiator; RegisterDevice device(initiator, - kDummyDeviceAddress, + kTestDeviceAddress, std::endian::little, RegisterAddressSize::k1Byte); @@ -465,7 +465,7 @@ TEST(RegisterDevice, ReadRegisters8ByteWith2RegistersAnd2ByteAddress) { TestInitiator initiator; RegisterDevice device(initiator, - kDummyDeviceAddress, + kTestDeviceAddress, std::endian::little, RegisterAddressSize::k2Bytes); @@ -495,7 +495,7 @@ TEST(RegisterDevice, ReadRegisters16With2RegistersAnd2ByteAddress) { TestInitiator initiator; RegisterDevice device(initiator, - kDummyDeviceAddress, + kTestDeviceAddress, std::endian::little, RegisterAddressSize::k2Bytes); @@ -526,7 +526,7 @@ TEST(RegisterDevice, ReadRegisters16With2RegistersAnd2ByteAddressBigEndian) { TestInitiator initiator; RegisterDevice device(initiator, - kDummyDeviceAddress, + kTestDeviceAddress, std::endian::big, RegisterAddressSize::k2Bytes); @@ -559,7 +559,7 @@ TEST(RegisterDevice, ReadRegister16With1ByteAddress) { TestInitiator initiator; RegisterDevice device(initiator, - kDummyDeviceAddress, + kTestDeviceAddress, std::endian::little, RegisterAddressSize::k1Byte); @@ -590,7 +590,7 @@ TEST(RegisterDevice, ReadRegister32With1ByteAddress) { TestInitiator initiator; RegisterDevice device(initiator, - kDummyDeviceAddress, + kTestDeviceAddress, std::endian::little, RegisterAddressSize::k1Byte); @@ -622,7 +622,7 @@ TEST(RegisterDevice, ReadRegister16With2ByteAddress) { TestInitiator initiator; RegisterDevice device(initiator, - kDummyDeviceAddress, + kTestDeviceAddress, std::endian::little, RegisterAddressSize::k2Bytes); @@ -653,7 +653,7 @@ TEST(RegisterDevice, ReadRegister16With1ByteAddressAndBigEndian) { TestInitiator initiator; RegisterDevice device(initiator, - kDummyDeviceAddress, + kTestDeviceAddress, std::endian::big, RegisterAddressSize::k1Byte); @@ -686,7 +686,7 @@ TEST(RegisterDevice, ReadRegister32With1ByteAddressAndBigEndian) { TestInitiator initiator; RegisterDevice device(initiator, - kDummyDeviceAddress, + kTestDeviceAddress, std::endian::big, RegisterAddressSize::k1Byte); @@ -720,7 +720,7 @@ TEST(RegisterDevice, ReadRegister16With2ByteAddressAndBigEndian) { TestInitiator initiator; RegisterDevice device(initiator, - kDummyDeviceAddress, + kTestDeviceAddress, std::endian::big, RegisterAddressSize::k2Bytes);
diff --git a/pw_tokenizer/argument_types_test.cc b/pw_tokenizer/argument_types_test.cc index cf3b22b..696886e 100644 --- a/pw_tokenizer/argument_types_test.cc +++ b/pw_tokenizer/argument_types_test.cc
@@ -23,7 +23,7 @@ namespace pw::tokenizer { namespace { -struct DummyType {}; +struct FakeType {}; // Check each relevant type mapping. #define CHECK_TYPE(c_type, enum_type) \ @@ -61,7 +61,7 @@ CHECK_TYPE(unsigned char*, _PW_TOKENIZER_SELECT_INT_TYPE(void*)); CHECK_TYPE(int*, _PW_TOKENIZER_SELECT_INT_TYPE(void*)); CHECK_TYPE(long long*, _PW_TOKENIZER_SELECT_INT_TYPE(void*)); -CHECK_TYPE(DummyType*, _PW_TOKENIZER_SELECT_INT_TYPE(void*)); +CHECK_TYPE(FakeType*, _PW_TOKENIZER_SELECT_INT_TYPE(void*)); // nullptr CHECK_TYPE(std::nullptr_t, _PW_TOKENIZER_SELECT_INT_TYPE(void*));
diff --git a/pw_tokenizer/argument_types_test_c.c b/pw_tokenizer/argument_types_test_c.c index 849357d..05257d7 100644 --- a/pw_tokenizer/argument_types_test_c.c +++ b/pw_tokenizer/argument_types_test_c.c
@@ -24,7 +24,7 @@ #error "This is a test of C code and must be compiled as C, not C++." #endif // __cplusplus -struct DummyType {}; // stand-in type for pointer argument type test +struct FakeType {}; // stand-in type for pointer argument type test // Check each relevant type mapping using static_asserts. #define CHECK_TYPE(c_type, enum_type) \ @@ -62,7 +62,7 @@ CHECK_TYPE(unsigned char*, _PW_TOKENIZER_SELECT_INT_TYPE(void*)); CHECK_TYPE(int*, _PW_TOKENIZER_SELECT_INT_TYPE(void*)); CHECK_TYPE(long long*, _PW_TOKENIZER_SELECT_INT_TYPE(void*)); -CHECK_TYPE(struct DummyType*, _PW_TOKENIZER_SELECT_INT_TYPE(void*)); +CHECK_TYPE(struct FakeType*, _PW_TOKENIZER_SELECT_INT_TYPE(void*)); // clang-format on // null