commit 67368878c411332b9a5b3c77982a11d9be1f156a
author Wyatt Hepler <hepler@google.com> Thu Jul 30 16:55:38 2020 -0700
committer CQ Bot Account <commit-bot@chromium.org> Tue Aug 04 19:01:22 2020 +0000
tree e364895704e66a4320bc624e0c6aa7b850ce0e41
parent 2d1950255b4c80e4cb6cfb10c0c54356962211cc

pw_log_tokenized: Tokenized logging updates

- Accept span<const uint8_t> in the Base64 tokenized log encoding
  function, since the tokenization C function provides the bytes as
  uint8_t.
- Update pw_log_tokenized dependencies to resolve circular dependencies
  when using pw_log_tokenized as the backend for pw_log.

Change-Id: Id2c64356131cbe81921991468456917eff8b984c
Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/15267
Commit-Queue: Wyatt Hepler <hepler@google.com>
Reviewed-by: Keir Mierle <keir@google.com>

pw_tokenizer/base64_test.cc

diff --git a/pw_tokenizer/base64_test.cc b/pw_tokenizer/base64_test.cc
index 59f3a05..d6ff56e 100644
--- a/pw_tokenizer/base64_test.cc
+++ b/pw_tokenizer/base64_test.cc
@@ -23,11 +23,13 @@
 namespace pw::tokenizer {
 namespace {
 
+using std::byte;
+
 class PrefixedBase64 : public ::testing::Test {
  protected:
   PrefixedBase64() : binary_{}, base64_{} {}
 
-  std::byte binary_[32];
+  byte binary_[32];
   char base64_[32];
 };
 
@@ -37,7 +39,7 @@
       : binary{std::as_bytes(std::span(binary_data, kSize - 1))},
         base64(base64_data) {}
 
-  std::span<const std::byte> binary;
+  std::span<const byte> binary;
   std::string_view base64;
 } kTestData[] = {
     {"", "$"},
@@ -64,7 +66,7 @@
 }
 
 TEST_F(PrefixedBase64, Encode_EmptyInput_WritesPrefix) {
-  EXPECT_EQ(1u, PrefixedBase64Encode({}, base64_));
+  EXPECT_EQ(1u, PrefixedBase64Encode(std::span<byte>(), base64_));
   EXPECT_EQ('$', base64_[0]);
 }
 
@@ -83,18 +85,18 @@
 
 TEST_F(PrefixedBase64, Decode_EmptyInput_WritesNothing) {
   EXPECT_EQ(0u, PrefixedBase64Decode({}, binary_));
-  EXPECT_EQ(std::byte{0}, binary_[0]);
+  EXPECT_EQ(byte{0}, binary_[0]);
 }
 
 TEST_F(PrefixedBase64, Decode_OnlyPrefix_WritesNothing) {
   EXPECT_EQ(0u, PrefixedBase64Decode("$", binary_));
-  EXPECT_EQ(std::byte{0}, binary_[0]);
+  EXPECT_EQ(byte{0}, binary_[0]);
 }
 
 TEST_F(PrefixedBase64, Decode_EmptyOutput_WritesNothing) {
   EXPECT_EQ(0u,
             PrefixedBase64Decode(kTestData[5].base64, std::span(binary_, 0)));
-  EXPECT_EQ(std::byte{0}, binary_[0]);
+  EXPECT_EQ(byte{0}, binary_[0]);
 }
 
 TEST_F(PrefixedBase64, Decode_OutputTooSmall_WritesNothing) {
@@ -102,11 +104,11 @@
   EXPECT_EQ(0u,
             PrefixedBase64Decode(item.base64,
                                  std::span(binary_, item.binary.size() - 1)));
-  EXPECT_EQ(std::byte{0}, binary_[0]);
+  EXPECT_EQ(byte{0}, binary_[0]);
 }
 
 TEST(PrefixedBase64, DecodeInPlace) {
-  std::byte buffer[32];
+  byte buffer[32];
 
   for (auto& [binary, base64] : kTestData) {
     std::memcpy(buffer, base64.data(), base64.size());