scripted-diff: Use std::span over Span

-BEGIN VERIFY SCRIPT-

 ren() { sed -i "s!\<$1\>!$2!g" $( git grep -l "$1" -- "./src" ":(exclude)src/span.h" ":(exclude)src/leveldb/db/log_test.cc" ) ; }

 ren Span            std::span
 ren AsBytes         std::as_bytes
 ren AsWritableBytes std::as_writable_bytes

 sed -i 's!SpanPopBack(Span!SpanPopBack(std::span!g' ./src/span.h

-END VERIFY SCRIPT-
This commit is contained in:
MarcoFalke committed 2025-03-12 19:45:37 +01:00
1 parent fadccc26c0
commit fade0b5e5e
120 files changed
+543 -543

No files matched your search

+15 -15
View File
@@ -25,7 +25,7 @@
#include <vector>
namespace util {
inline void Xor(Span<std::byte> write, Span<const std::byte> key, size_t key_offset = 0)
inline void Xor(std::span<std::byte> write, std::span<const std::byte> key, size_t key_offset = 0)
{
if (key.size() == 0) {
return;
@@ -71,7 +71,7 @@ public:
{
::SerializeMany(*this, std::forward<Args>(args)...);
}
void write(Span<const std::byte> src)
void write(std::span<const std::byte> src)
{
assert(nPos <= vchData.size());
size_t nOverwrite = std::min(src.size(), vchData.size() - nPos);
@@ -95,18 +95,18 @@ private:
size_t nPos;
};
/** Minimal stream for reading from an existing byte array by Span.
/** Minimal stream for reading from an existing byte array by std::span.
*/
class SpanReader
{
private:
Span<const unsigned char> m_data;
std::span<const unsigned char> m_data;
public:
/**
* @param[in] data Referenced byte vector to overwrite/append
*/
explicit SpanReader(Span<const unsigned char> data) : m_data{data} {}
explicit SpanReader(std::span<const unsigned char> data) : m_data{data} {}
template<typename T>
SpanReader& operator>>(T&& obj)
@@ -118,7 +118,7 @@ public:
size_t size() const { return m_data.size(); }
bool empty() const { return m_data.empty(); }
void read(Span<std::byte> dst)
void read(std::span<std::byte> dst)
{
if (dst.size() == 0) {
return;
@@ -162,8 +162,8 @@ public:
typedef vector_type::reverse_iterator reverse_iterator;
explicit DataStream() = default;
explicit DataStream(Span<const uint8_t> sp) : DataStream{AsBytes(sp)} {}
explicit DataStream(Span<const value_type> sp) : vch(sp.data(), sp.data() + sp.size()) {}
explicit DataStream(std::span<const uint8_t> sp) : DataStream{std::as_bytes(sp)} {}
explicit DataStream(std::span<const value_type> sp) : vch(sp.data(), sp.data() + sp.size()) {}
std::string str() const
{
@@ -215,7 +215,7 @@ public:
bool eof() const { return size() == 0; }
int in_avail() const { return size(); }
void read(Span<value_type> dst)
void read(std::span<value_type> dst)
{
if (dst.size() == 0) return;
@@ -248,7 +248,7 @@ public:
m_read_pos = next_read_pos.value();
}
void write(Span<const value_type> src)
void write(std::span<const value_type> src)
{
// Write to the end of the buffer
vch.insert(vch.end(), src.begin(), src.end());
@@ -431,7 +431,7 @@ public:
void SetXor(std::vector<std::byte> data_xor) { m_xor = data_xor; }
/** Implementation detail, only used internally. */
std::size_t detail_fread(Span<std::byte> dst);
std::size_t detail_fread(std::span<std::byte> dst);
/** Wrapper around fseek(). Will throw if seeking is not possible. */
void seek(int64_t offset, int origin);
@@ -448,9 +448,9 @@ public:
//
// Stream subset
//
void read(Span<std::byte> dst);
void read(std::span<std::byte> dst);
void ignore(size_t nSize);
void write(Span<const std::byte> src);
void write(std::span<const std::byte> src);
template <typename T>
AutoFile& operator<<(const T& obj)
@@ -492,7 +492,7 @@ private:
readNow = nAvail;
if (readNow == 0)
return false;
size_t nBytes{m_src.detail_fread(Span{vchBuf}.subspan(pos, readNow))};
size_t nBytes{m_src.detail_fread(std::span{vchBuf}.subspan(pos, readNow))};
if (nBytes == 0) {
throw std::ios_base::failure{m_src.feof() ? "BufferedFile::Fill: end of file" : "BufferedFile::Fill: fread failed"};
}
@@ -536,7 +536,7 @@ public:
}
//! read a number of bytes
void read(Span<std::byte> dst)
void read(std::span<std::byte> dst)
{
while (dst.size() > 0) {
auto [buffer_pointer, length]{AdvanceStream(dst.size())};