commit e2cbadfa0cd342abb37ce5a70d4e019fb2b2e790
author Wyatt Hepler <hepler@google.com> Mon Jun 22 11:21:45 2020 -0700
committer CQ Bot Account <commit-bot@chromium.org> Wed Jul 01 01:37:27 2020 +0000
tree 5634bcc53aea3055154397f65b6da2917737dd44
parent d3d1cb075535dc3bece256f8cbbf960d3f2bf72e

pw_span: Switch from pw::span to std::span

Replace pw::span with std::span and "pw_span/span.h" with <span>
throughout the codebase.

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

pw_protobuf/decoder_test.cc

diff --git a/pw_protobuf/decoder_test.cc b/pw_protobuf/decoder_test.cc
index abc9d54..7dad4b2 100644
--- a/pw_protobuf/decoder_test.cc
+++ b/pw_protobuf/decoder_test.cc
@@ -80,7 +80,7 @@
   };
   // clang-format on
 
-  Decoder decoder(as_bytes(span(encoded_proto)));
+  Decoder decoder(std::as_bytes(std::span(encoded_proto)));
 
   int32_t v1 = 0;
   EXPECT_EQ(decoder.Next(), Status::OK);
@@ -142,7 +142,7 @@
   };
   // clang-format on
 
-  Decoder decoder(as_bytes(span(encoded_proto)));
+  Decoder decoder(std::as_bytes(std::span(encoded_proto)));
 
   // Don't process any fields except for the fourth. Next should still iterate
   // correctly despite field values not being consumed.
@@ -178,7 +178,8 @@
   // clang-format on
 
   decoder.set_handler(&handler);
-  EXPECT_EQ(decoder.Decode(as_bytes(span(encoded_proto))), Status::OK);
+  EXPECT_EQ(decoder.Decode(std::as_bytes(std::span(encoded_proto))),
+            Status::OK);
   EXPECT_TRUE(handler.called);
   EXPECT_EQ(handler.test_int32, 42);
   EXPECT_EQ(handler.test_sint32, -13);
@@ -204,7 +205,8 @@
   // clang-format on
 
   decoder.set_handler(&handler);
-  EXPECT_EQ(decoder.Decode(as_bytes(span(encoded_proto))), Status::OK);
+  EXPECT_EQ(decoder.Decode(std::as_bytes(std::span(encoded_proto))),
+            Status::OK);
   EXPECT_TRUE(handler.called);
   EXPECT_EQ(handler.test_int32, 44);
 }
@@ -214,7 +216,7 @@
   TestDecodeHandler handler;
 
   decoder.set_handler(&handler);
-  EXPECT_EQ(decoder.Decode(span<std::byte>()), Status::OK);
+  EXPECT_EQ(decoder.Decode(std::span<std::byte>()), Status::OK);
   EXPECT_FALSE(handler.called);
   EXPECT_EQ(handler.test_int32, 0);
   EXPECT_EQ(handler.test_sint32, 0);
@@ -228,7 +230,8 @@
   uint8_t encoded_proto[] = {0x08};
 
   decoder.set_handler(&handler);
-  EXPECT_EQ(decoder.Decode(as_bytes(span(encoded_proto))), Status::DATA_LOSS);
+  EXPECT_EQ(decoder.Decode(std::as_bytes(std::span(encoded_proto))),
+            Status::DATA_LOSS);
 }
 
 // Only processes fields numbered 1 or 3.
@@ -282,7 +285,8 @@
   // clang-format on
 
   decoder.set_handler(&handler);
-  EXPECT_EQ(decoder.Decode(as_bytes(span(encoded_proto))), Status::OK);
+  EXPECT_EQ(decoder.Decode(std::as_bytes(std::span(encoded_proto))),
+            Status::OK);
   EXPECT_TRUE(handler.called);
   EXPECT_EQ(handler.field_one, 42);
   EXPECT_EQ(handler.field_three, 99);
@@ -331,7 +335,8 @@
   // clang-format on
 
   decoder.set_handler(&handler);
-  EXPECT_EQ(decoder.Decode(as_bytes(span(encoded_proto))), Status::CANCELLED);
+  EXPECT_EQ(decoder.Decode(std::as_bytes(std::span(encoded_proto))),
+            Status::CANCELLED);
   EXPECT_EQ(handler.field_one, 42);
   EXPECT_EQ(handler.field_three, 1111);
 }