From f5ee4f14517fe9330166f75ec82d89f9f68ff814 Mon Sep 17 00:00:00 2001
From: Joris Putcuyps <joris.putcuyps@gmail.com>
Date: Sat, 25 Apr 2026 20:19:58 +0200
Subject: [PATCH] Swap can be part of the etl namespace and let ADL do its
 thing

---
 include/etl/expected.h | 37 +++++++++++++++++++------------------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/include/etl/expected.h b/include/etl/expected.h
index 2bb2ca9a..5221bef1 100644
--- a/include/etl/expected.h
+++ b/include/etl/expected.h
@@ -1381,24 +1381,25 @@ namespace etl
   {
     return !(lhs == rhs);
   }
+
+  //*******************************************
+  /// Swap etl::expected.
+  //*******************************************
+  template <typename TValue, typename TError>
+  ETL_CONSTEXPR14 void swap(etl::expected<TValue, TError>& lhs, etl::expected<TValue, TError>& rhs)
+  {
+    lhs.swap(rhs);
+  }
+
+  //*******************************************
+  /// Swap etl::unexpected.
+  //*******************************************
+  template <typename TError>
+  ETL_CONSTEXPR14 void swap(etl::unexpected<TError>& lhs, etl::unexpected<TError>& rhs)
+  {
+    lhs.swap(rhs);
+  }
+
 } // namespace etl
 
-//*******************************************
-/// Swap etl::expected.
-//*******************************************
-template <typename TValue, typename TError>
-ETL_CONSTEXPR14 void swap(etl::expected<TValue, TError>& lhs, etl::expected<TValue, TError>& rhs)
-{
-  lhs.swap(rhs);
-}
-
-//*******************************************
-/// Swap etl::unexpected.
-//*******************************************
-template <typename TError>
-ETL_CONSTEXPR14 void swap(etl::unexpected<TError>& lhs, etl::unexpected<TError>& rhs)
-{
-  lhs.swap(rhs);
-}
-
 #endif