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

This changes uses of std::span to pw::span. No changes are made to build
dependencies in this commit.

This change was made with the following shell script:

  #!/bin/bash

  readonly FILES="$(git ls-files '*.rst' '*.md' '*.h' '*.cc' '*.py')"
  readonly PW_NS_FILES="$(git grep -l 'namespace pw\>' | grep -v generate_decoding_test_data.cc)"

  echo "Updating #includes"
  sed -i --follow-symlinks \
      's/#include <span>/#include "pw_span\/span.h"/g' ${FILES}

  for name in span as_bytes as_writable_bytes dynamic_extent; do
    echo Renaming std::$name to pw::$name
    sed -i --follow-symlinks "s/std::$name/pw::$name/g" ${FILES}
    sed -i --follow-symlinks "s/pw::$name/$name/g" ${PW_NS_FILES}
    sed -i --follow-symlinks "s/using $name;//" ${PW_NS_FILES}
  done

  git checkout pw_span

  pw format -b origin/main --fix

Bug: b/235237667
Change-Id: I32edfbcb7cadf3ab39009596fdb7275fcc5ea3f5
Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/98264
Commit-Queue: Wyatt Hepler <hepler@google.com>
Reviewed-by: Ted Pudlik <tpudlik@google.com>
Pigweed-Auto-Submit: Wyatt Hepler <hepler@google.com>

3 files changed, 12 insertions, 14 deletions

diff --git a/pw_log/proto_utils.cc b/pw_log/proto_utils.cc
index b0b28a3a9..7d1ce0107 100644
--- a/pw_log/proto_utils.cc
+++ b/pw_log/proto_utils.cc
@@ -14,13 +14,13 @@
 
 #include "pw_log/proto_utils.h"
 
-#include <span>
 #include <string_view>
 
 #include "pw_bytes/endian.h"
 #include "pw_log/levels.h"
 #include "pw_log_tokenized/metadata.h"
 #include "pw_protobuf/wire_format.h"
+#include "pw_span/span.h"
 
 namespace pw::log {
 
@@ -41,7 +41,7 @@ Result<ConstByteSpan> EncodeLog(int level,
   }
 
   // Defer status checks until the end.
-  Status status = encoder.WriteMessage(std::as_bytes(std::span(message)));
+  Status status = encoder.WriteMessage(as_bytes(span(message)));
   status = encoder.WriteLineLevel(PackLineLevel(line_number, level));
   if (flags != 0) {
     status = encoder.WriteFlags(flags);
@@ -50,13 +50,13 @@ Result<ConstByteSpan> EncodeLog(int level,
 
   // Module name and file name may or may not be present.
   if (!module_name.empty()) {
-    status = encoder.WriteModule(std::as_bytes(std::span(module_name)));
+    status = encoder.WriteModule(as_bytes(span(module_name)));
   }
   if (!file_name.empty()) {
-    status = encoder.WriteFile(std::as_bytes(std::span(file_name)));
+    status = encoder.WriteFile(as_bytes(span(file_name)));
   }
   if (!thread_name.empty()) {
-    status = encoder.WriteThread(std::as_bytes(std::span(thread_name)));
+    status = encoder.WriteThread(as_bytes(span(thread_name)));
   }
   PW_TRY(encoder.status());
   return ConstByteSpan(encoder);
@@ -81,8 +81,7 @@ LogEntry::MemoryEncoder CreateEncoderAndEncodeTokenizedLog(
   if (metadata.module() != 0) {
     const uint32_t little_endian_module =
         bytes::ConvertOrderTo(endian::little, metadata.module());
-    status =
-        encoder.WriteModule(std::as_bytes(std::span(&little_endian_module, 1)));
+    status = encoder.WriteModule(as_bytes(span(&little_endian_module, 1)));
   }
   return encoder;
 }
diff --git a/pw_log/protobuf.rst b/pw_log/protobuf.rst
index 32f9ba2e0..8ad8cb03f 100644
--- a/pw_log/protobuf.rst
+++ b/pw_log/protobuf.rst
@@ -100,7 +100,7 @@ for encoding tokenized logs and string-based logs.
 
      Result<ConstByteSpan> result = EncodeTokenizedLog(
          metadata,
-         std::as_bytes(std::span(data, size)),
+         pw::as_bytes(pw::span(data, size)),
          log_buffer);
      if (result.ok()) {
        // This makes use of the encoded log proto and is custom per-product.
diff --git a/pw_log/public/pw_log/proto_utils.h b/pw_log/public/pw_log/proto_utils.h
index a9bada5d5..c6d3e34c5 100644
--- a/pw_log/public/pw_log/proto_utils.h
+++ b/pw_log/public/pw_log/proto_utils.h
@@ -95,11 +95,10 @@ inline Result<ConstByteSpan> EncodeTokenizedLog(
     size_t tokenized_data_size,
     int64_t ticks_since_epoch,
     ByteSpan encode_buffer) {
-  return EncodeTokenizedLog(
-      metadata,
-      std::as_bytes(std::span(tokenized_data, tokenized_data_size)),
-      ticks_since_epoch,
-      encode_buffer);
+  return EncodeTokenizedLog(metadata,
+                            as_bytes(span(tokenized_data, tokenized_data_size)),
+                            ticks_since_epoch,
+                            encode_buffer);
 }
 
 // Encodes tokenized message (passed as pointer and size), tokenized metadata,
@@ -118,7 +117,7 @@ inline Result<ConstByteSpan> EncodeTokenizedLog(
     ByteSpan encode_buffer) {
   LogEntry::MemoryEncoder encoder = CreateEncoderAndEncodeTokenizedLog(
       metadata,
-      std::as_bytes(std::span(tokenized_data, tokenized_data_size)),
+      as_bytes(span(tokenized_data, tokenized_data_size)),
       ticks_since_epoch,
       encode_buffer);
   if (!thread_name.empty()) {