[libc++] Remove a few unused includes in <utility> headers

[philnik777]

No description provided.

[llvmbot]

@llvm/pr-subscribers-libcxx

Author: Nikolas Klauser (philnik777)

Changes

---

Full diff: https://github.com/llvm/llvm-project/pull/129674.diff

5 Files Affected:

• (modified) libcxx/include/__utility/exception_guard.h (-1)
• (modified) libcxx/include/__utility/no_destroy.h (-1)
• (modified) libcxx/include/__utility/pair.h (-3)
• (modified) libcxx/include/__utility/scope_guard.h (-1)
• (modified) libcxx/include/__utility/swap.h (-1)

diff --git a/libcxx/include/__utility/exception_guard.h b/libcxx/include/__utility/exception_guard.h
index a6b4ec5211078..94f67f8e6ca49 100644
--- a/libcxx/include/__utility/exception_guard.h
+++ b/libcxx/include/__utility/exception_guard.h
@@ -12,7 +12,6 @@
 #include <__assert>
 #include <__config>
 #include <__type_traits/is_nothrow_constructible.h>
-#include <__utility/exchange.h>
 #include <__utility/move.h>
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
diff --git a/libcxx/include/__utility/no_destroy.h b/libcxx/include/__utility/no_destroy.h
index 16f424ae119c4..e1eccb3950332 100644
--- a/libcxx/include/__utility/no_destroy.h
+++ b/libcxx/include/__utility/no_destroy.h
@@ -11,7 +11,6 @@
 
 #include <__config>
 #include <__new/placement_new_delete.h>
-#include <__type_traits/is_constant_evaluated.h>
 #include <__utility/forward.h>
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
diff --git a/libcxx/include/__utility/pair.h b/libcxx/include/__utility/pair.h
index 7689ab2a48c6a..b4ac977f587a5 100644
--- a/libcxx/include/__utility/pair.h
+++ b/libcxx/include/__utility/pair.h
@@ -23,7 +23,6 @@
 #include <__type_traits/common_reference.h>
 #include <__type_traits/common_type.h>
 #include <__type_traits/conditional.h>
-#include <__type_traits/decay.h>
 #include <__type_traits/enable_if.h>
 #include <__type_traits/integral_constant.h>
 #include <__type_traits/is_assignable.h>
@@ -32,11 +31,9 @@
 #include <__type_traits/is_implicitly_default_constructible.h>
 #include <__type_traits/is_nothrow_assignable.h>
 #include <__type_traits/is_nothrow_constructible.h>
-#include <__type_traits/is_same.h>
 #include <__type_traits/is_swappable.h>
 #include <__type_traits/is_trivially_relocatable.h>
 #include <__type_traits/nat.h>
-#include <__type_traits/remove_cvref.h>
 #include <__type_traits/unwrap_ref.h>
 #include <__utility/declval.h>
 #include <__utility/forward.h>
diff --git a/libcxx/include/__utility/scope_guard.h b/libcxx/include/__utility/scope_guard.h
index e51b300d1f50c..3972102eee891 100644
--- a/libcxx/include/__utility/scope_guard.h
+++ b/libcxx/include/__utility/scope_guard.h
@@ -10,7 +10,6 @@
 #ifndef _LIBCPP___UTILITY_SCOPE_GUARD_H
 #define _LIBCPP___UTILITY_SCOPE_GUARD_H
 
-#include <__assert>
 #include <__config>
 #include <__utility/move.h>
 
diff --git a/libcxx/include/__utility/swap.h b/libcxx/include/__utility/swap.h
index b4311540d36ef..d374825d7c4d1 100644
--- a/libcxx/include/__utility/swap.h
+++ b/libcxx/include/__utility/swap.h
@@ -17,7 +17,6 @@
 #include <__type_traits/is_nothrow_assignable.h>
 #include <__type_traits/is_nothrow_constructible.h>
 #include <__type_traits/is_swappable.h>
-#include <__utility/declval.h>
 #include <__utility/move.h>
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)