➖ Remove tcp::span, use C++20 std::span instead

paulreimer · paulreimer · commit 2bc77aded443 · 2022-10-22T18:58:36.000-07:00
diff --git a/actor_model/CMakeLists.txt b/actor_model/CMakeLists.txt
@@ -14,7 +14,6 @@ idf_component_register(
     "src"
     "${CMAKE_CURRENT_BINARY_DIR}/src/gen"
   REQUIRES
-    "span"
     "uuid"
   PRIV_REQUIRES
     "esp_ringbuf"
diff --git a/actor_model/src/mailbox.h b/actor_model/src/mailbox.h
@@ -16,8 +16,7 @@
 
 #include "actor_model_generated.h"
 
-#include "tcb/span.hpp"
-
+#include <span>
 #include <string_view>
 #include <unordered_map>
 
@@ -27,7 +26,7 @@
 
 namespace ActorModel {
 using MessageType = std::string_view;
-using BufferView = tcb::span<const uint8_t>;
+using BufferView = std::span<const uint8_t>;
 
 class ReceivedMessage;
 
diff --git a/actor_model/src/received_message.h b/actor_model/src/received_message.h
@@ -14,10 +14,10 @@
 
 #include "mailbox.h"
 
-#include "tcb/span.hpp"
+#include <span>
 
 namespace ActorModel {
-using BufferView = tcb::span<const uint8_t>;
+using BufferView = std::span<const uint8_t>;
 
 class Mailbox;
 
diff --git a/base64/CMakeLists.txt b/base64/CMakeLists.txt
@@ -6,8 +6,6 @@ idf_component_register(
   INCLUDE_DIRS
     "lib/libb64/include"
     "src"
-  PRIV_REQUIRES
-    "span"
 )
 
 
diff --git a/base64/src/base64.h b/base64/src/base64.h
@@ -9,15 +9,14 @@
  */
 #pragma once
 
-#include "tcb/span.hpp"
-
+#include <span>
 #include <vector>
 
 #include <stdio.h>
 
 namespace base64 {
 using Buffer = std::vector<uint8_t>;
-using BufferView = tcb::span<const uint8_t>;
+using BufferView = std::span<const uint8_t>;
 
 auto encode(BufferView in)
   -> Buffer;
diff --git a/embedded_files/CMakeLists.txt b/embedded_files/CMakeLists.txt
@@ -1,6 +1,4 @@
 idf_component_register(
   INCLUDE_DIRS
     "src"
-  REQUIRES
-    "span"
 )
diff --git a/embedded_files/src/embedded_files_string_view_wrapper.h b/embedded_files/src/embedded_files_string_view_wrapper.h
@@ -10,8 +10,7 @@
 
 #pragma once
 
-#include "tcb/span.hpp"
-
+#include <span>
 #include <string_view>
 
 #define DECLARE_STRING_VIEW_WRAPPER(file_name_with_ext)       \
@@ -29,7 +28,7 @@
     asm("_binary_" #file_name_with_ext "_start");             \
   extern const uint8_t file_name_with_ext ## _end[]           \
     asm("_binary_" #file_name_with_ext "_end");               \
-  const tcb::span<const uint8_t> file_name_with_ext(                                       \
+  const std::span<const uint8_t> file_name_with_ext(                                       \
     file_name_with_ext ## _start,                             \
     file_name_with_ext ## _end - file_name_with_ext ## _start \
   )
diff --git a/flatbuffers/CMakeLists.txt b/flatbuffers/CMakeLists.txt
@@ -6,8 +6,6 @@ idf_component_register(
   INCLUDE_DIRS
     "lib/flatbuffers/include"
     "src"
-  REQUIRES
-    "span"
 )
 
 target_compile_options(
diff --git a/flatbuffers/src/flatbuffers_utils.h b/flatbuffers/src/flatbuffers_utils.h
@@ -9,11 +9,10 @@
  */
 #pragma once
 
-#include "tcb/span.hpp"
-
+#include <span>
 #include <string_view>
 
-using GenericFlatbuffer = tcb::span<const uint8_t>;
+using GenericFlatbuffer = std::span<const uint8_t>;
 using FlatbufferSchema = std::string_view;
 
 struct Bounds
diff --git a/googleapis/CMakeLists.txt b/googleapis/CMakeLists.txt
@@ -6,8 +6,6 @@ idf_component_register(
   INCLUDE_DIRS
     "src"
     "${CMAKE_CURRENT_BINARY_DIR}/src/gen"
-  REQUIRES
-    "span"
   PRIV_REQUIRES
     "actor_model"
     "embedded_files"
diff --git a/googleapis/src/visualization_query_actor.cpp b/googleapis/src/visualization_query_actor.cpp
@@ -16,12 +16,11 @@
 
 #include "delay.h"
 
-#include "tcb/span.hpp"
-
 #include "esp_log.h"
 
 #include <chrono>
 #include <deque>
+#include <span>
 #include <string>
 
 namespace googleapis {
@@ -33,7 +32,7 @@ using namespace Requests;
 using namespace std::chrono_literals;
 
 using string = std::string;
-using BufferView = tcb::span<const uint8_t>;
+using BufferView = std::span<const uint8_t>;
 
 using StringPair = std::pair<string, string>;
 
diff --git a/json_flatbuffers/CMakeLists.txt b/json_flatbuffers/CMakeLists.txt
@@ -4,8 +4,6 @@ idf_component_register(
     "src/json_to_flatbuffers_converter.cpp"
   INCLUDE_DIRS
     "src"
-  REQUIRES
-    "span"
   PRIV_REQUIRES
     "flatbuffers"
     "json_streaming"
diff --git a/json_flatbuffers/src/json_to_flatbuffers_converter.h b/json_flatbuffers/src/json_to_flatbuffers_converter.h
@@ -14,8 +14,7 @@
 
 #include "delegate.hpp"
 
-#include "tcb/span.hpp"
-
+#include <span>
 #include <string_view>
 
 #include "flatbuffers/idl.h"
@@ -24,7 +23,7 @@
 
 namespace JsonFlatbuffers {
 using string_view = std::string_view;
-using BufferView = tcb::span<const uint8_t>;
+using BufferView = std::span<const uint8_t>;
 
 class JsonToFlatbuffersConverter
 {
diff --git a/jwt/CMakeLists.txt b/jwt/CMakeLists.txt
@@ -3,8 +3,6 @@ idf_component_register(
     "src/jwt.cpp"
   INCLUDE_DIRS
     "src"
-  REQUIRES
-    "span"
   PRIV_REQUIRES
     "base64"
     "mbedtls"
diff --git a/jwt/src/jwt.h b/jwt/src/jwt.h
@@ -9,15 +9,14 @@
  */
 #pragma once
 
-#include "tcb/span.hpp"
-
+#include <span>
 #include <vector>
 
 #include "mbedtls/pk.h"
 
 namespace JWT {
 using Buffer = std::vector<uint8_t>;
-using BufferView = tcb::span<const uint8_t>;
+using BufferView = std::span<const uint8_t>;
 
 class JWTGenerator
 {
diff --git a/module_manager/CMakeLists.txt b/module_manager/CMakeLists.txt
@@ -15,8 +15,6 @@ idf_component_register(
     "${CMAKE_CURRENT_BINARY_DIR}/src/gen"
   PRIV_INCLUDE_DIRS
     "lib/libelfin/elf"
-  REQUIRES
-    "span"
   PRIV_REQUIRES
     "actor_model"
     "embedded_files"
diff --git a/module_manager/src/buffer_view_loader.h b/module_manager/src/buffer_view_loader.h
@@ -10,7 +10,7 @@
 
 #pragma once
 
-#include "tcb/span.hpp"
+#include <span>
 
 #include "elf/elf++.hh"
 
@@ -19,7 +19,7 @@ namespace ModuleManager {
 class BufferViewLoader
 : public elf::loader
 {
-  using BufferView = tcb::span<const uint8_t>;
+  using BufferView = std::span<const uint8_t>;
   const BufferView buffer;
 public:
 
diff --git a/module_manager/src/loader.cpp b/module_manager/src/loader.cpp
@@ -14,18 +14,17 @@
 
 #include "xtensa_elf.h"
 
-#include "tcb/span.hpp"
-
 #include "esp_heap_caps.h"
 #include "esp_log.h"
 
 #include <chrono>
+#include <span>
 
 namespace ModuleManager {
 
 using namespace std::chrono_literals;
 
-using BufferView = tcb::span<const uint8_t>;
+using BufferView = std::span<const uint8_t>;
 using string_view = std::string_view;
 using XtensaElf32::RelocType;
 
@@ -254,7 +253,7 @@ auto Loader::_apply_relocs_for_section(
   // List of relocations
   const auto &reloc_hdr = reloc_section.get_hdr();
   auto reloc_count = (reloc_section.size() / reloc_hdr.entsize);
-  tcb::span<XtensaElf32::Rela> relocs(
+  std::span<XtensaElf32::Rela> relocs(
     const_cast<XtensaElf32::Rela*>(
       static_cast<const XtensaElf32::Rela*>(reloc_section.data())
     ),
diff --git a/module_manager/src/loader.h b/module_manager/src/loader.h
@@ -19,10 +19,10 @@
 
 #include "elf/elf++.hh"
 
-#include "tcb/span.hpp"
+#include <span>
 
 namespace ModuleManager {
-using BufferView = tcb::span<const uint8_t>;
+using BufferView = std::span<const uint8_t>;
 using string_view = std::string_view;
 
 class Loader
diff --git a/osc/CMakeLists.txt b/osc/CMakeLists.txt
@@ -5,8 +5,6 @@ idf_component_register(
   INCLUDE_DIRS
     "lib/tinyosc"
     "src"
-  REQUIRES
-    "span"
   PRIV_REQUIRES
     "flatbuffers"
     "uuid"
diff --git a/osc/src/osc.h b/osc/src/osc.h
@@ -13,13 +13,13 @@
 #include "uuid.h"
 
 #include "flatbuffers/flatbuffers.h"
-#include "tcb/span.hpp"
 
+#include <span>
 #include <vector>
 
 namespace OSC {
 using Buffer = std::vector<uint8_t>;
-using BufferView = tcb::span<const uint8_t>;
+using BufferView = std::span<const uint8_t>;
 
 using MutableGenericFlatbuffer = std::vector<uint8_t>;
 
diff --git a/requests/CMakeLists.txt b/requests/CMakeLists.txt
@@ -12,8 +12,6 @@ idf_component_register(
     "lib/cpp17_headers/include"
     "src"
     "${CMAKE_CURRENT_BINARY_DIR}/src/gen"
-  REQUIRES
-    "span"
   PRIV_INCLUDE_DIRS
     "lib"
   PRIV_REQUIRES
diff --git a/requests/src/request_manager.h b/requests/src/request_manager.h
@@ -25,9 +25,8 @@ extern "C" {
 }
 #endif // REQUESTS_USE_SH2LIB
 
-#include "tcb/span.hpp"
-
 #include <memory>
+#include <span>
 #include <string>
 #include <unordered_map>
 
@@ -55,7 +54,7 @@ class RequestManager
 #endif // REQUESTS_USE_SH2LIB
   using HandleImplPtr = std::unique_ptr<HandleImpl, void(*)(HandleImpl*)>;
 
-  using BufferView = tcb::span<const uint8_t>;
+  using BufferView = std::span<const uint8_t>;
 
   RequestManager();
   ~RequestManager();
diff --git a/requests/src/requests.h b/requests/src/requests.h
@@ -16,15 +16,14 @@
 
 #include "requests_generated.h"
 
-#include "tcb/span.hpp"
-
+#include <span>
 #include <string_view>
 #include <utility>
 #include <vector>
 
 namespace Requests {
 using Buffer = std::vector<uint8_t>;
-using BufferView = tcb::span<const uint8_t>;
+using BufferView = std::span<const uint8_t>;
 using string_view = std::string_view;
 
 using RequestPayloadFlatbuffer = flatbuffers::DetachedBuffer;
diff --git a/span/CMakeLists.txt b/span/CMakeLists.txt
diff --git a/span/lib/span/include/tcb/span.hpp b/span/lib/span/include/tcb/span.hpp
diff --git a/udp_server/CMakeLists.txt b/udp_server/CMakeLists.txt
diff --git a/udp_server/src/udp_server_actor.cpp b/udp_server/src/udp_server_actor.cpp
diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt
diff --git a/utils/src/filesystem.h b/utils/src/filesystem.h

Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,6 @@ idf_component_register(`
`6`	`6`	`INCLUDE_DIRS`
`7`	`7`	`"lib/libb64/include"`
`8`	`8`	`"src"`
`9`		`- PRIV_REQUIRES`
`10`		`- "span"`
`11`	`9`	`)`
`12`	`10`
`13`	`11`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,4 @@`
`1`	`1`	`idf_component_register(`
`2`	`2`	`INCLUDE_DIRS`
`3`	`3`	`"src"`
`4`		`- REQUIRES`
`5`		`- "span"`
`6`	`4`	`)`
Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,6 @@ idf_component_register(`
`6`	`6`	`INCLUDE_DIRS`
`7`	`7`	`"lib/flatbuffers/include"`
`8`	`8`	`"src"`
`9`		`- REQUIRES`
`10`		`- "span"`
`11`	`9`	`)`
`12`	`10`
`13`	`11`	`target_compile_options(`