From cfa46bc4a251341747fb75e19e54c15f7f9c9171 Mon Sep 17 00:00:00 2001
From: Marcus Holland-Moritz <github@mhxnet.de>
Date: Fri, 26 May 2023 18:05:36 +0200
Subject: [PATCH] folly::Range -> std::span in fs_section

---
 include/dwarfs/fs_section.h |  9 +++++----
 src/dwarfs/fs_section.cpp   | 10 +++++-----
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/include/dwarfs/fs_section.h b/include/dwarfs/fs_section.h
index 46d38737..6b56b13b 100644
--- a/include/dwarfs/fs_section.h
+++ b/include/dwarfs/fs_section.h
@@ -22,10 +22,9 @@
 #pragma once
 
 #include <memory>
+#include <span>
 #include <string>
 
-#include <folly/Range.h>
-
 #include "dwarfs/fstypes.h"
 
 namespace dwarfs {
@@ -46,7 +45,9 @@ class fs_section {
   std::string description() const { return impl_->description(); }
   bool check_fast(mmif const& mm) const { return impl_->check_fast(mm); }
   bool verify(mmif const& mm) const { return impl_->verify(mm); }
-  folly::ByteRange data(mmif const& mm) const { return impl_->data(mm); }
+  std::span<uint8_t const> data(mmif const& mm) const {
+    return impl_->data(mm);
+  }
 
   size_t end() const { return start() + length(); }
 
@@ -62,7 +63,7 @@ class fs_section {
     virtual std::string description() const = 0;
     virtual bool check_fast(mmif const& mm) const = 0;
     virtual bool verify(mmif const& mm) const = 0;
-    virtual folly::ByteRange data(mmif const& mm) const = 0;
+    virtual std::span<uint8_t const> data(mmif const& mm) const = 0;
   };
 
  private:
diff --git a/src/dwarfs/fs_section.cpp b/src/dwarfs/fs_section.cpp
index 5a882268..5cb64eca 100644
--- a/src/dwarfs/fs_section.cpp
+++ b/src/dwarfs/fs_section.cpp
@@ -91,8 +91,8 @@ class fs_section_v1 : public fs_section::impl {
   bool check_fast(mmif const&) const override { return true; }
   bool verify(mmif const&) const override { return true; }
 
-  folly::ByteRange data(mmif const& mm) const override {
-    return folly::ByteRange(mm.as<uint8_t>(start_), hdr_.length);
+  std::span<uint8_t const> data(mmif const& mm) const override {
+    return mm.span(start_, hdr_.length);
   }
 
  private:
@@ -140,8 +140,8 @@ class fs_section_v2 : public fs_section::impl {
                             sizeof(hdr_.sha2_512_256));
   }
 
-  folly::ByteRange data(mmif const& mm) const override {
-    return folly::ByteRange(mm.as<uint8_t>(start_), hdr_.length);
+  std::span<uint8_t const> data(mmif const& mm) const override {
+    return mm.span(start_, hdr_.length);
   }
 
  private:
@@ -173,7 +173,7 @@ class fs_section_v2_lazy : public fs_section::impl {
 
   bool verify(mmif const& mm) const override { return section().verify(mm); }
 
-  folly::ByteRange data(mmif const& mm) const override {
+  std::span<uint8_t const> data(mmif const& mm) const override {
     return section().data(mm);
   }