From 23e059517c30fe6802bbe0f2ad331aaad6653673 Mon Sep 17 00:00:00 2001
From: Matan Breizman <mbreizma@redhat.com>
Date: Tue, 9 Jul 2024 11:45:25 +0000
Subject: [PATCH] Revert "sstring: deprecate formatters for vector and
 unordered_map"

This reverts commit 914a4241c36c41a327cfbe77813bffc6d0de1274.

Signed-off-by: Matan Breizman <mbreizma@redhat.com>
---
 CMakeLists.txt                  | 9 ---------
 include/seastar/core/sstring.hh | 6 ------
 2 files changed, 15 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3db75e8b502..b485b3b1f30 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -65,10 +65,6 @@ option (Seastar_SSTRING
   "Use seastar's own string implementation"
   ON)
 
-option (Seastar_DEPRECATED_OSTREAM_FORMATTERS
-  "Enable operator<< for formatting standard library containers, which will be deprecated in future"
-  ON)
-
 set (Seastar_API_LEVEL
   "7"
   CACHE
@@ -934,11 +930,6 @@ if (Seastar_SSTRING)
     PUBLIC SEASTAR_SSTRING)
 endif ()
 
-if (Seastar_DEPRECATED_OSTREAM_FORMATTERS)
-  target_compile_definitions (seastar
-    PUBLIC SEASTAR_DEPRECATED_OSTREAM_FORMATTERS)
-endif ()
-
 if (LinuxMembarrier_FOUND)
   list (APPEND Seastar_PRIVATE_COMPILE_DEFINITIONS SEASTAR_HAS_MEMBARRIER)
 
diff --git a/include/seastar/core/sstring.hh b/include/seastar/core/sstring.hh
index fd8032e2067..97e75c2713a 100644
--- a/include/seastar/core/sstring.hh
+++ b/include/seastar/core/sstring.hh
@@ -836,13 +836,10 @@ string_type to_sstring(T value) {
 }
 }
 
-#ifdef SEASTAR_DEPRECATED_OSTREAM_FORMATTERS
-
 namespace std {
 
 SEASTAR_MODULE_EXPORT
 template <typename T>
-[[deprecated("Use {fmt} instead")]]
 inline
 std::ostream& operator<<(std::ostream& os, const std::vector<T>& v) {
     bool first = true;
@@ -861,7 +858,6 @@ std::ostream& operator<<(std::ostream& os, const std::vector<T>& v) {
 
 SEASTAR_MODULE_EXPORT
 template <typename Key, typename T, typename Hash, typename KeyEqual, typename Allocator>
-[[deprecated("Use {fmt} instead")]]
 std::ostream& operator<<(std::ostream& os, const std::unordered_map<Key, T, Hash, KeyEqual, Allocator>& v) {
     bool first = true;
     os << "{";
@@ -878,8 +874,6 @@ std::ostream& operator<<(std::ostream& os, const std::unordered_map<Key, T, Hash
 }
 }
 
-#endif
-
 #if FMT_VERSION >= 90000
 
 // Due to https://github.com/llvm/llvm-project/issues/68849, we inherit