From d091dc78154d1c6341251f1ed13bfe3b33f10773 Mon Sep 17 00:00:00 2001
From: Joel Klinghed <the_jk@spawned.biz>
Date: Wed, 17 Sep 2025 00:05:42 +0200
Subject: uio: Remove unnecessary wrappers

---
 src/uio.cc | 32 --------------------------------
 src/uio.hh | 10 ----------
 2 files changed, 42 deletions(-)

diff --git a/src/uio.cc b/src/uio.cc
index 475d793..e82e435 100644
--- a/src/uio.cc
+++ b/src/uio.cc
@@ -572,22 +572,6 @@ std::unique_ptr<Reader> open(std::unique_ptr<io::Reader> reader,
   std::unreachable();
 }
 
-std::expected<std::unique_ptr<Reader>, io::OpenError> open(
-    const std::string& file_path, u::ReaderConfig config) {
-  auto ret = io::open(file_path);
-  if (ret.has_value())
-    return open(std::move(ret.value()), config);
-  return std::unexpected(ret.error());
-}
-
-std::expected<std::unique_ptr<Reader>, io::OpenError> openat(
-    int dirfd, const std::string& file_path, u::ReaderConfig config) {
-  auto ret = io::openat(dirfd, file_path);
-  if (ret.has_value())
-    return open(std::move(ret.value()), config);
-  return std::unexpected(ret.error());
-}
-
 }  // namespace u8
 
 namespace u16 {
@@ -675,20 +659,4 @@ std::unique_ptr<Reader> open(std::unique_ptr<io::Reader> reader,
   std::unreachable();
 }
 
-std::expected<std::unique_ptr<Reader>, io::OpenError> open(
-    const std::string& file_path, u::ReaderConfig config) {
-  auto ret = io::open(file_path);
-  if (ret.has_value())
-    return open(std::move(ret.value()), config);
-  return std::unexpected(ret.error());
-}
-
-std::expected<std::unique_ptr<Reader>, io::OpenError> openat(
-    int dirfd, const std::string& file_path, u::ReaderConfig config) {
-  auto ret = io::openat(dirfd, file_path);
-  if (ret.has_value())
-    return open(std::move(ret.value()), config);
-  return std::unexpected(ret.error());
-}
-
 }  // namespace u16
diff --git a/src/uio.hh b/src/uio.hh
index 3b26351..8a55f03 100644
--- a/src/uio.hh
+++ b/src/uio.hh
@@ -44,11 +44,6 @@ class Reader : public io::Reader {
 [[nodiscard]] std::unique_ptr<Reader> open(std::unique_ptr<io::Reader> reader,
                                            u::ReaderConfig config = {});
 
-[[nodiscard]] std::expected<std::unique_ptr<Reader>, io::OpenError> open(
-    const std::string& file_path, u::ReaderConfig config = {});
-[[nodiscard]] std::expected<std::unique_ptr<Reader>, io::OpenError> openat(
-    int dirfd, const std::string& file_path, u::ReaderConfig config = {});
-
 }  // namespace u8
 
 namespace u16 {
@@ -68,11 +63,6 @@ class Reader : public io::Reader {
 [[nodiscard]] std::unique_ptr<Reader> open(std::unique_ptr<io::Reader> reader,
                                            u::ReaderConfig config = {});
 
-[[nodiscard]] std::expected<std::unique_ptr<Reader>, io::OpenError> open(
-    const std::string& file_path, u::ReaderConfig config = {});
-[[nodiscard]] std::expected<std::unique_ptr<Reader>, io::OpenError> openat(
-    int dirfd, const std::string& file_path, u::ReaderConfig config = {});
-
 }  // namespace u16
 
 #endif  // UIO_HH
-- 
cgit v1.3