From 03fc296d48294da297f70fa922ba153557c3b243 Mon Sep 17 00:00:00 2001
From: Kefu Chai <kefu.chai@scylladb.com>
Date: Tue, 21 May 2024 22:20:06 +0800
Subject: [PATCH] std-compat: remove #include:s which were added for pre C++17

these `#include`s were introduced by 0bbcbbae and 79e846e9, for backward
compatibility with pre-C++17 era. since we've dropped C++17 support,
and now only support C++20 and up. let's remove these cruft.

Signed-off-by: Kefu Chai <kefu.chai@scylladb.com>
---
 include/seastar/core/resource.hh        | 2 ++
 include/seastar/net/config.hh           | 2 +-
 include/seastar/util/exceptions.hh      | 2 +-
 include/seastar/util/read_first_line.hh | 2 +-
 include/seastar/util/std-compat.hh      | 6 ------
 include/seastar/util/variant_utils.hh   | 2 +-
 src/net/config.cc                       | 1 +
 7 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/include/seastar/core/resource.hh b/include/seastar/core/resource.hh
index 87e5d0a6794..b01a337d9b2 100644
--- a/include/seastar/core/resource.hh
+++ b/include/seastar/core/resource.hh
@@ -27,6 +27,8 @@
 #ifndef SEASTAR_MODULE
 #include <cassert>
 #include <cstdlib>
+#include <memory>
+#include <optional>
 #include <string>
 #include <vector>
 #include <set>
diff --git a/include/seastar/net/config.hh b/include/seastar/net/config.hh
index 6432d3c4535..df22be8a94a 100644
--- a/include/seastar/net/config.hh
+++ b/include/seastar/net/config.hh
@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include <seastar/util/std-compat.hh>
+#include <optional>
 #include <istream>
 #include <string>
 #include <unordered_map>
diff --git a/include/seastar/util/exceptions.hh b/include/seastar/util/exceptions.hh
index 9b58e987e47..da4402ac4f3 100644
--- a/include/seastar/util/exceptions.hh
+++ b/include/seastar/util/exceptions.hh
@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include <seastar/util/std-compat.hh>
+#include <filesystem>
 
 namespace seastar {
 
diff --git a/include/seastar/util/read_first_line.hh b/include/seastar/util/read_first_line.hh
index bb4b55dda88..5b87d913749 100644
--- a/include/seastar/util/read_first_line.hh
+++ b/include/seastar/util/read_first_line.hh
@@ -1,4 +1,4 @@
-#include <seastar/util/std-compat.hh>
+#include <filesystem>
 #include <seastar/core/sstring.hh>
 #ifndef SEASTAR_MODULE
 #include <boost/lexical_cast.hpp>
diff --git a/include/seastar/util/std-compat.hh b/include/seastar/util/std-compat.hh
index 9b2969d1ce5..7c58cb68143 100644
--- a/include/seastar/util/std-compat.hh
+++ b/include/seastar/util/std-compat.hh
@@ -25,12 +25,6 @@
 
 #ifndef SEASTAR_MODULE
 
-#include <optional>
-#include <string_view>
-#include <variant>
-
-#include <filesystem>
-
 #if __has_include(<memory_resource>)
 #include <memory_resource>
 #else
diff --git a/include/seastar/util/variant_utils.hh b/include/seastar/util/variant_utils.hh
index ddb2192d2d7..872706274fa 100644
--- a/include/seastar/util/variant_utils.hh
+++ b/include/seastar/util/variant_utils.hh
@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include <seastar/util/std-compat.hh>
+#include <variant>
 
 namespace seastar {
 
diff --git a/src/net/config.cc b/src/net/config.cc
index b192bc3c586..4835941728b 100644
--- a/src/net/config.cc
+++ b/src/net/config.cc
@@ -29,6 +29,7 @@ module;
 #include <yaml-cpp/yaml.h>
 #include <algorithm>
 #include <istream>
+#include <optional>
 #include <unordered_map>
 #include <string>