[symbolizer-markup] Avoid nonstandard dependencies

Standard C++20 is enough for this.

Change-Id: I1c503443430245c9c673111d0d10ea6b591d9aca
Reviewed-on: https://fuchsia-review.googlesource.com/c/fuchsia/+/1152195
Reviewed-by: Joshua Seaton <[email protected]>
Fuchsia-Auto-Submit: Roland McGrath <[email protected]>
Commit-Queue: Auto-Submit <[email protected]>

Author: frobtech

sdk/lib/dl/test/BUILD.gn

@@ -42,6 +42,7 @@ test("dl-unittests") {
     deps += [
       ":dl-unittest.deps",
       "..:runtime",
+      "//sdk/lib/fit",
       "//sdk/lib/ld/testing",
       "//src/lib/elfldltl/testing",
     ]

sdk/lib/dl/test/dl-impl-tests.h

@@ -5,6 +5,7 @@
 #ifndef LIB_DL_TEST_DL_IMPL_TESTS_H_
 #define LIB_DL_TEST_DL_IMPL_TESTS_H_
 
+#include <lib/fit/defer.h>
 #include <lib/stdcompat/functional.h>
 
 #include "../runtime-dynamic-linker.h"

sdk/lib/dl/test/dl-system-tests.cc

@@ -5,6 +5,7 @@
 #include "dl-system-tests.h"
 
 #include <dlfcn.h>
+#include <lib/fit/defer.h>
 
 #include <cstring>
 

src/lib/symbolizer-markup/BUILD.gn

@@ -10,14 +10,6 @@ library_headers("headers") {
     "lib/symbolizer-markup/line-buffered-sink.h",
     "lib/symbolizer-markup/writer.h",
   ]
-
-  public_deps = [
-    "//sdk/lib/fit",
-    "//sdk/lib/stdcompat",
-  ]
-  if (!is_fuchsia) {
-    public_deps += [ "//zircon/system/public" ]
-  }
 }
 
 source_set("symbolizer-markup") {

src/lib/symbolizer-markup/include/lib/symbolizer-markup/line-buffered-sink.h

@@ -5,10 +5,9 @@
 #ifndef SRC_LIB_SYMBOLIZER_MARKUP_INCLUDE_LIB_SYMBOLIZER_MARKUP_LINE_BUFFERED_SINK_H_
 #define SRC_LIB_SYMBOLIZER_MARKUP_INCLUDE_LIB_SYMBOLIZER_MARKUP_LINE_BUFFERED_SINK_H_
 
-#include <lib/stdcompat/span.h>
-
 #include <array>
 #include <cassert>
+#include <span>
 #include <string_view>
 
 namespace symbolizer_markup {
@@ -40,7 +39,7 @@ struct LineBuffered {
     constexpr explicit Sink(LineSink line_sink) : line_sink_{std::move(line_sink)} {}
 
     void operator()(std::string_view str) {
-      cpp20::span left = cpp20::span{buffer_}.subspan(used_);
+      std::span left = std::span{buffer_}.subspan(used_);
       assert(!left.empty());  // Previous call should have flushed if full.
       while (!str.empty()) {
         size_t n = str.copy(left.data(), left.size());

src/lib/symbolizer-markup/include/lib/symbolizer-markup/writer.h

@@ -5,15 +5,13 @@
 #ifndef SRC_LIB_SYMBOLIZER_MARKUP_INCLUDE_LIB_SYMBOLIZER_MARKUP_WRITER_H_
 #define SRC_LIB_SYMBOLIZER_MARKUP_INCLUDE_LIB_SYMBOLIZER_MARKUP_WRITER_H_
 
-#include <lib/fit/defer.h>
-#include <lib/stdcompat/span.h>
-#include <zircon/assert.h>
-
+#include <cassert>
 #include <climits>
 #include <cstddef>
 #include <cstdint>
 #include <initializer_list>
 #include <limits>
+#include <span>
 #include <string_view>
 #include <type_traits>
 #include <utility>
@@ -82,12 +80,17 @@ class Writer {
   auto ChangeColor(Color color, bool bold = false) {
     using namespace std::string_view_literals;
 
+    struct ResetColor {
+      ~ResetColor() { writer.Literal("\033[0m"sv); }
+      Writer& writer;
+    };
+
     Literal("\033["sv).template DecimalDigits(static_cast<unsigned int>(color)).Literal('m');
     if (bold) {
       Literal("\033[1m"sv);
     }
 
-    return fit::defer([this]() { Literal("\033[0m"sv); });
+    return ResetColor{*this};
   }
 
   //
@@ -155,7 +158,7 @@ class Writer {
   // Emits the markup for a given ELF module.
   //
   // {{{module:$id:$name:elf:$build_id}}}
-  Writer& ElfModule(unsigned int id, std::string_view name, cpp20::span<const std::byte> build_id) {
+  Writer& ElfModule(unsigned int id, std::string_view name, std::span<const std::byte> build_id) {
     return BeginElement(kModule)
         .DecimalField(id)
         .Field(name)
@@ -170,7 +173,7 @@ class Writer {
   // {{mmap:$start:$size:load:$module_id:$perms:$static_start}}
   Writer& LoadImageMmap(uintptr_t start, size_t size, unsigned int module_id,
                         const MemoryPermissions& perms, uint64_t static_start) {
-    ZX_ASSERT(perms.read || perms.write || perms.execute);
+    assert(perms.read || perms.write || perms.execute);
     char perm_str[3];
     size_t perm_size = 0;
     if (perms.read) {
@@ -309,7 +312,7 @@ class Writer {
     return Separator().HexDigits(n);
   }
 
-  Writer& HexField(cpp20::span<const std::byte> bytes) {
+  Writer& HexField(std::span<const std::byte> bytes) {
     Separator();
     for (const std::byte byte : bytes) {
       const uint8_t b = static_cast<uint8_t>(byte);

src/lib/symbolizer-markup/unittests.cc

@@ -5,6 +5,7 @@
 #include <lib/symbolizer-markup/line-buffered-sink.h>
 #include <lib/symbolizer-markup/writer.h>
 
+#include <span>
 #include <string>
 #include <string_view>
 
@@ -235,9 +236,9 @@ TEST(SymbolizerMarkupTests, Module) {
   std::string markup;
   symbolizer_markup::Writer writer(Sink{markup});
 
-  writer.ElfModule(5, "moduleA", cpp20::as_bytes(cpp20::span{kBuildIdA}))
+  writer.ElfModule(5, "moduleA", std::as_bytes(std::span{kBuildIdA}))
       .Newline()
-      .ElfModule(10, "moduleB", cpp20::as_bytes(cpp20::span{kBuildIdB}));
+      .ElfModule(10, "moduleB", std::as_bytes(std::span{kBuildIdB}));
 
   constexpr std::string_view kExpected = R"""({{{module:5:moduleA:elf:545975394d10a07d}}}
 {{{module:10:moduleB:elf:ba43d6f6911e8723}}})""";