From a19145388ca9804bf7d0d21299dc1887c7d994e4 Mon Sep 17 00:00:00 2001 From: Marcus Holland-Moritz Date: Sat, 29 Mar 2025 15:04:07 +0100 Subject: [PATCH] refactor: drop rvalue-ref `compress` overload --- include/dwarfs/block_compressor.h | 12 ------------ src/compression/brotli.cpp | 6 ------ src/compression/flac.cpp | 6 ------ src/compression/lz4.cpp | 6 ------ src/compression/lzma.cpp | 6 ------ src/compression/null.cpp | 7 +------ src/compression/ricepp.cpp | 6 ------ src/compression/zstd.cpp | 6 ------ 8 files changed, 1 insertion(+), 54 deletions(-) diff --git a/include/dwarfs/block_compressor.h b/include/dwarfs/block_compressor.h index 22e7d977..40662913 100644 --- a/include/dwarfs/block_compressor.h +++ b/include/dwarfs/block_compressor.h @@ -65,20 +65,11 @@ class block_compressor { return impl_->compress(data, nullptr); } - std::vector compress(std::vector&& data) const { - return impl_->compress(std::move(data), nullptr); - } - std::vector compress(std::span data, std::string const& metadata) const { return impl_->compress(data, &metadata); } - std::vector - compress(std::vector&& data, std::string const& metadata) const { - return impl_->compress(std::move(data), &metadata); - } - compression_type type() const { return impl_->type(); } std::string describe() const { return impl_->describe(); } @@ -103,9 +94,6 @@ class block_compressor { virtual std::vector compress(std::span data, std::string const* metadata) const = 0; - virtual std::vector - compress(std::vector&& data, - std::string const* metadata) const = 0; virtual compression_type type() const = 0; virtual std::string describe() const = 0; diff --git a/src/compression/brotli.cpp b/src/compression/brotli.cpp index ff7ecb11..6d62329e 100644 --- a/src/compression/brotli.cpp +++ b/src/compression/brotli.cpp @@ -69,12 +69,6 @@ class brotli_block_compressor final : public block_compressor::impl { return compressed; } - // NOLINTNEXTLINE(cppcoreguidelines-rvalue-reference-param-not-moved) - std::vector compress(std::vector&& data, - std::string const* metadata) const override { - return compress(data, metadata); - } - compression_type type() const override { return compression_type::BROTLI; } std::string describe() const override { diff --git a/src/compression/flac.cpp b/src/compression/flac.cpp index 170abad4..4b34de7c 100644 --- a/src/compression/flac.cpp +++ b/src/compression/flac.cpp @@ -344,12 +344,6 @@ class flac_block_compressor final : public block_compressor::impl { return compressed; } - // NOLINTNEXTLINE(cppcoreguidelines-rvalue-reference-param-not-moved) - std::vector compress(std::vector&& data, - std::string const* metadata) const override { - return compress(data, metadata); - } - compression_type type() const override { return compression_type::FLAC; } std::string describe() const override { diff --git a/src/compression/lz4.cpp b/src/compression/lz4.cpp index b1f1f977..f20efbbb 100644 --- a/src/compression/lz4.cpp +++ b/src/compression/lz4.cpp @@ -91,12 +91,6 @@ class lz4_block_compressor final : public block_compressor::impl { return compressed; } - // NOLINTNEXTLINE(cppcoreguidelines-rvalue-reference-param-not-moved) - std::vector compress(std::vector&& data, - std::string const* metadata) const override { - return compress(data, metadata); - } - compression_type type() const override { return compression_type::LZ4; } std::string describe() const override { return Policy::describe(level_); } diff --git a/src/compression/lzma.cpp b/src/compression/lzma.cpp index fc5309ef..d00eeeac 100644 --- a/src/compression/lzma.cpp +++ b/src/compression/lzma.cpp @@ -114,12 +114,6 @@ class lzma_block_compressor final : public block_compressor::impl { std::vector compress(std::span data, std::string const* metadata) const override; - // NOLINTNEXTLINE(cppcoreguidelines-rvalue-reference-param-not-moved) - std::vector compress(std::vector&& data, - std::string const* metadata) const override { - return compress(data, metadata); - } - compression_type type() const override { return compression_type::LZMA; } std::string describe() const override { return description_; } diff --git a/src/compression/null.cpp b/src/compression/null.cpp index a869102f..cf5f8681 100644 --- a/src/compression/null.cpp +++ b/src/compression/null.cpp @@ -41,18 +41,13 @@ class null_block_compressor final : public block_compressor::impl { return std::make_unique(*this); } + // TODO: we should not have to copy the data here... std::vector compress(std::span data, std::string const* /*metadata*/) const override { return std::vector(data.begin(), data.end()); } - std::vector - compress(std::vector&& data, - std::string const* /*metadata*/) const override { - return std::move(data); - } - compression_type type() const override { return compression_type::NONE; } std::string describe() const override { return "null"; } diff --git a/src/compression/ricepp.cpp b/src/compression/ricepp.cpp index dde2bdc4..22dc58df 100644 --- a/src/compression/ricepp.cpp +++ b/src/compression/ricepp.cpp @@ -130,12 +130,6 @@ class ricepp_block_compressor final : public block_compressor::impl { return compressed; } - // NOLINTNEXTLINE(cppcoreguidelines-rvalue-reference-param-not-moved) - std::vector compress(std::vector&& data, - std::string const* metadata) const override { - return compress(data, metadata); - } - compression_type type() const override { return compression_type::RICEPP; } std::string describe() const override { diff --git a/src/compression/zstd.cpp b/src/compression/zstd.cpp index 6c921505..def9c289 100644 --- a/src/compression/zstd.cpp +++ b/src/compression/zstd.cpp @@ -57,12 +57,6 @@ class zstd_block_compressor final : public block_compressor::impl { std::vector compress(std::span data, std::string const* metadata) const override; - // NOLINTNEXTLINE(cppcoreguidelines-rvalue-reference-param-not-moved) - std::vector compress(std::vector&& data, - std::string const* metadata) const override { - return compress(data, metadata); - } - compression_type type() const override { return compression_type::ZSTD; } std::string describe() const override {