From b8b04f8f39b56a74c2ed83880e4cb765545e6a61 Mon Sep 17 00:00:00 2001
From: Damian Jarek <damian.jarek93@gmail.com>
Date: Sun, 23 Jun 2019 08:59:26 +0200
Subject: [PATCH] Cleanup transitive includes in
 beast/core/detail/type_traits.hpp

Signed-off-by: Damian Jarek <damian.jarek93@gmail.com>
---
 CHANGELOG.md                                      |  1 +
 .../beast/_experimental/test/impl/stream.hpp      |  2 +-
 include/boost/beast/core/detail/ostream.hpp       |  1 -
 include/boost/beast/core/detail/type_traits.hpp   | 15 +--------------
 include/boost/beast/core/impl/basic_stream.hpp    |  1 -
 .../beast/core/impl/buffered_read_stream.hpp      |  2 +-
 include/boost/beast/core/impl/buffers_adaptor.hpp |  1 -
 include/boost/beast/core/impl/buffers_cat.hpp     |  1 -
 include/boost/beast/core/impl/multi_buffer.hpp    |  3 +--
 include/boost/beast/core/impl/static_buffer.hpp   |  1 -
 include/boost/beast/core/impl/static_buffer.ipp   |  1 -
 include/boost/beast/core/impl/static_string.hpp   |  1 -
 include/boost/beast/core/span.hpp                 |  6 +++---
 include/boost/beast/core/string_param.hpp         |  1 -
 include/boost/beast/http/impl/file_body_win32.hpp |  1 +
 include/boost/beast/http/impl/message.hpp         |  1 -
 include/boost/beast/http/impl/write.hpp           |  1 +
 include/boost/beast/http/string_body.hpp          |  1 -
 include/boost/beast/http/vector_body.hpp          |  1 -
 .../boost/beast/websocket/detail/decorator.hpp    |  1 -
 include/boost/beast/websocket/impl/accept.hpp     |  1 -
 include/boost/beast/websocket/impl/stream.hpp     |  1 -
 .../boost/beast/websocket/impl/stream_impl.hpp    |  1 -
 include/boost/beast/websocket/impl/teardown.hpp   |  2 +-
 include/boost/beast/websocket/option.hpp          |  9 ---------
 include/boost/beast/websocket/stream.hpp          |  1 -
 .../boost/beast/zlib/detail/deflate_stream.hpp    |  1 -
 .../boost/beast/zlib/detail/deflate_stream.ipp    |  1 -
 test/beast/core/buffer_traits.cpp                 |  2 +-
 test/beast/core/span.cpp                          |  2 ++
 30 files changed, 14 insertions(+), 50 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4b51e425..ea4011d9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@ Version 260:
 * More split compilation in rfc7230.hpp
 * Qualify calls to `beast::iequals` in basic_parser.ipp
 * More split compilation in websocket/detail/mask.hpp
+* Cleanup transitive includes in beast/core/detail/type_traits.hpp
 
 --------------------------------------------------------------------------------
 
diff --git a/include/boost/beast/_experimental/test/impl/stream.hpp b/include/boost/beast/_experimental/test/impl/stream.hpp
index a0bc8262..acc709e7 100644
--- a/include/boost/beast/_experimental/test/impl/stream.hpp
+++ b/include/boost/beast/_experimental/test/impl/stream.hpp
@@ -13,7 +13,7 @@
 #include <boost/beast/core/bind_handler.hpp>
 #include <boost/beast/core/buffer_traits.hpp>
 #include <boost/beast/core/detail/service_base.hpp>
-#include <boost/beast/core/detail/type_traits.hpp>
+#include <boost/beast/core/detail/is_invocable.hpp>
 #include <mutex>
 #include <stdexcept>
 #include <vector>
diff --git a/include/boost/beast/core/detail/ostream.hpp b/include/boost/beast/core/detail/ostream.hpp
index 65da5601..8785c2e6 100644
--- a/include/boost/beast/core/detail/ostream.hpp
+++ b/include/boost/beast/core/detail/ostream.hpp
@@ -12,7 +12,6 @@
 
 #include <boost/beast/core/buffers_prefix.hpp>
 #include <boost/beast/core/buffers_range.hpp>
-#include <boost/beast/core/detail/type_traits.hpp>
 #include <boost/throw_exception.hpp>
 #include <boost/asio/buffer.hpp>
 #include <memory>
diff --git a/include/boost/beast/core/detail/type_traits.hpp b/include/boost/beast/core/detail/type_traits.hpp
index 1c10731e..e94abbb1 100644
--- a/include/boost/beast/core/detail/type_traits.hpp
+++ b/include/boost/beast/core/detail/type_traits.hpp
@@ -10,16 +10,9 @@
 #ifndef BOOST_BEAST_DETAIL_TYPE_TRAITS_HPP
 #define BOOST_BEAST_DETAIL_TYPE_TRAITS_HPP
 
-#include <boost/beast/core/error.hpp>
-#include <boost/beast/core/detail/is_invocable.hpp>
-#include <boost/asio/buffer.hpp>
-#include <boost/mp11/function.hpp>
 #include <boost/type_traits/make_void.hpp>
-#include <iterator>
-#include <tuple>
 #include <type_traits>
-#include <string>
-#include <utility>
+#include <new>
 
 namespace boost {
 namespace beast {
@@ -82,12 +75,6 @@ using aligned_union_t =
 
 //------------------------------------------------------------------------------
 
-template<class T>
-void
-accept_rv(T){}
-
-//------------------------------------------------------------------------------
-
 // for span
 template<class T, class E, class = void>
 struct is_contiguous_container: std::false_type {};
diff --git a/include/boost/beast/core/impl/basic_stream.hpp b/include/boost/beast/core/impl/basic_stream.hpp
index e1589789..336c09f2 100644
--- a/include/boost/beast/core/impl/basic_stream.hpp
+++ b/include/boost/beast/core/impl/basic_stream.hpp
@@ -13,7 +13,6 @@
 #include <boost/beast/core/async_base.hpp>
 #include <boost/beast/core/buffer_traits.hpp>
 #include <boost/beast/core/buffers_prefix.hpp>
-#include <boost/beast/core/detail/type_traits.hpp>
 #include <boost/beast/websocket/teardown.hpp>
 #include <boost/asio/coroutine.hpp>
 #include <boost/assert.hpp>
diff --git a/include/boost/beast/core/impl/buffered_read_stream.hpp b/include/boost/beast/core/impl/buffered_read_stream.hpp
index 18488116..cea0dcb9 100644
--- a/include/boost/beast/core/impl/buffered_read_stream.hpp
+++ b/include/boost/beast/core/impl/buffered_read_stream.hpp
@@ -15,7 +15,7 @@
 #include <boost/beast/core/error.hpp>
 #include <boost/beast/core/read_size.hpp>
 #include <boost/beast/core/stream_traits.hpp>
-#include <boost/beast/core/detail/type_traits.hpp>
+#include <boost/beast/core/detail/is_invocable.hpp>
 #include <boost/asio/post.hpp>
 #include <boost/throw_exception.hpp>
 
diff --git a/include/boost/beast/core/impl/buffers_adaptor.hpp b/include/boost/beast/core/impl/buffers_adaptor.hpp
index 91caad54..3eac32f6 100644
--- a/include/boost/beast/core/impl/buffers_adaptor.hpp
+++ b/include/boost/beast/core/impl/buffers_adaptor.hpp
@@ -11,7 +11,6 @@
 #define BOOST_BEAST_IMPL_BUFFERS_ADAPTOR_HPP
 
 #include <boost/beast/core/buffer_traits.hpp>
-#include <boost/beast/core/detail/type_traits.hpp>
 #include <boost/asio/buffer.hpp>
 #include <boost/config/workaround.hpp>
 #include <boost/throw_exception.hpp>
diff --git a/include/boost/beast/core/impl/buffers_cat.hpp b/include/boost/beast/core/impl/buffers_cat.hpp
index 81a6c78d..a0506a0b 100644
--- a/include/boost/beast/core/impl/buffers_cat.hpp
+++ b/include/boost/beast/core/impl/buffers_cat.hpp
@@ -11,7 +11,6 @@
 #define BOOST_BEAST_IMPL_BUFFERS_CAT_HPP
 
 #include <boost/beast/core/detail/tuple.hpp>
-#include <boost/beast/core/detail/type_traits.hpp>
 #include <boost/beast/core/detail/variant.hpp>
 #include <boost/asio/buffer.hpp>
 #include <cstdint>
diff --git a/include/boost/beast/core/impl/multi_buffer.hpp b/include/boost/beast/core/impl/multi_buffer.hpp
index 643f60ce..fde5ed68 100644
--- a/include/boost/beast/core/impl/multi_buffer.hpp
+++ b/include/boost/beast/core/impl/multi_buffer.hpp
@@ -11,7 +11,6 @@
 #define BOOST_BEAST_IMPL_MULTI_BUFFER_HPP
 
 #include <boost/beast/core/buffer_traits.hpp>
-#include <boost/beast/core/detail/type_traits.hpp>
 #include <boost/config/workaround.hpp>
 #include <boost/core/exchange.hpp>
 #include <boost/assert.hpp>
@@ -529,7 +528,7 @@ template<class Allocator>
 basic_multi_buffer<Allocator>::
 basic_multi_buffer(
     basic_multi_buffer&& other,
-    Allocator const& alloc) 
+    Allocator const& alloc)
     : boost::empty_value<
         base_alloc_type>(boost::empty_init_t(), alloc)
     , max_(other.max_)
diff --git a/include/boost/beast/core/impl/static_buffer.hpp b/include/boost/beast/core/impl/static_buffer.hpp
index dee13bfb..7012eaf0 100644
--- a/include/boost/beast/core/impl/static_buffer.hpp
+++ b/include/boost/beast/core/impl/static_buffer.hpp
@@ -10,7 +10,6 @@
 #ifndef BOOST_BEAST_IMPL_STATIC_BUFFER_HPP
 #define BOOST_BEAST_IMPL_STATIC_BUFFER_HPP
 
-#include <boost/beast/core/detail/type_traits.hpp>
 #include <boost/asio/buffer.hpp>
 #include <boost/throw_exception.hpp>
 #include <algorithm>
diff --git a/include/boost/beast/core/impl/static_buffer.ipp b/include/boost/beast/core/impl/static_buffer.ipp
index c26ff429..36f9d3ab 100644
--- a/include/boost/beast/core/impl/static_buffer.ipp
+++ b/include/boost/beast/core/impl/static_buffer.ipp
@@ -11,7 +11,6 @@
 #define BOOST_BEAST_IMPL_STATIC_BUFFER_IPP
 
 #include <boost/beast/core/static_buffer.hpp>
-#include <boost/beast/core/detail/type_traits.hpp>
 #include <boost/asio/buffer.hpp>
 #include <boost/throw_exception.hpp>
 #include <algorithm>
diff --git a/include/boost/beast/core/impl/static_string.hpp b/include/boost/beast/core/impl/static_string.hpp
index c668b837..13354d6d 100644
--- a/include/boost/beast/core/impl/static_string.hpp
+++ b/include/boost/beast/core/impl/static_string.hpp
@@ -11,7 +11,6 @@
 #define BOOST_BEAST_IMPL_STATIC_STRING_HPP
 
 #include <boost/beast/core/detail/static_string.hpp>
-#include <boost/beast/core/detail/type_traits.hpp>
 #include <boost/throw_exception.hpp>
 
 namespace boost {
diff --git a/include/boost/beast/core/span.hpp b/include/boost/beast/core/span.hpp
index e1707294..55a1454e 100644
--- a/include/boost/beast/core/span.hpp
+++ b/include/boost/beast/core/span.hpp
@@ -186,21 +186,21 @@ public:
     {
         return data_;
     }
-                
+
     /// Returns an iterator to the beginning of the span
     const_iterator
     cbegin() const
     {
         return data_;
     }
-       
+
     /// Returns an iterator to one past the end of the span
     const_iterator
     end() const
     {
         return data_ + size_;
     }
-        
+
     /// Returns an iterator to one past the end of the span
     const_iterator
     cend() const
diff --git a/include/boost/beast/core/string_param.hpp b/include/boost/beast/core/string_param.hpp
index 67ef6946..cc55bfd1 100644
--- a/include/boost/beast/core/string_param.hpp
+++ b/include/boost/beast/core/string_param.hpp
@@ -14,7 +14,6 @@
 #include <boost/beast/core/string.hpp>
 #include <boost/beast/core/static_string.hpp>
 #include <boost/beast/core/detail/static_ostream.hpp>
-#include <boost/beast/core/detail/type_traits.hpp>
 #include <boost/optional.hpp>
 
 namespace boost {
diff --git a/include/boost/beast/http/impl/file_body_win32.hpp b/include/boost/beast/http/impl/file_body_win32.hpp
index fc74c497..cfeb5aae 100644
--- a/include/boost/beast/http/impl/file_body_win32.hpp
+++ b/include/boost/beast/http/impl/file_body_win32.hpp
@@ -16,6 +16,7 @@
 #include <boost/beast/core/bind_handler.hpp>
 #include <boost/beast/core/buffers_range.hpp>
 #include <boost/beast/core/detail/clamp.hpp>
+#include <boost/beast/core/detail/is_invocable.hpp>
 #include <boost/beast/http/serializer.hpp>
 #include <boost/asio/async_result.hpp>
 #include <boost/asio/basic_stream_socket.hpp>
diff --git a/include/boost/beast/http/impl/message.hpp b/include/boost/beast/http/impl/message.hpp
index 805d01f0..4b101ad3 100644
--- a/include/boost/beast/http/impl/message.hpp
+++ b/include/boost/beast/http/impl/message.hpp
@@ -11,7 +11,6 @@
 #define BOOST_BEAST_HTTP_IMPL_MESSAGE_HPP
 
 #include <boost/beast/core/error.hpp>
-#include <boost/beast/core/detail/type_traits.hpp>
 #include <boost/assert.hpp>
 #include <boost/throw_exception.hpp>
 #include <stdexcept>
diff --git a/include/boost/beast/http/impl/write.hpp b/include/boost/beast/http/impl/write.hpp
index 251ba7f8..79b0c83d 100644
--- a/include/boost/beast/http/impl/write.hpp
+++ b/include/boost/beast/http/impl/write.hpp
@@ -16,6 +16,7 @@
 #include <boost/beast/core/buffers_range.hpp>
 #include <boost/beast/core/make_printable.hpp>
 #include <boost/beast/core/stream_traits.hpp>
+#include <boost/beast/core/detail/is_invocable.hpp>
 #include <boost/asio/coroutine.hpp>
 #include <boost/asio/post.hpp>
 #include <boost/asio/write.hpp>
diff --git a/include/boost/beast/http/string_body.hpp b/include/boost/beast/http/string_body.hpp
index 73a01a41..aeeefcc4 100644
--- a/include/boost/beast/http/string_body.hpp
+++ b/include/boost/beast/http/string_body.hpp
@@ -16,7 +16,6 @@
 #include <boost/beast/http/message.hpp>
 #include <boost/beast/core/buffers_range.hpp>
 #include <boost/beast/core/detail/clamp.hpp>
-#include <boost/beast/core/detail/type_traits.hpp>
 #include <boost/asio/buffer.hpp>
 #include <boost/optional.hpp>
 #include <cstdint>
diff --git a/include/boost/beast/http/vector_body.hpp b/include/boost/beast/http/vector_body.hpp
index 1317ec3f..c599e162 100644
--- a/include/boost/beast/http/vector_body.hpp
+++ b/include/boost/beast/http/vector_body.hpp
@@ -15,7 +15,6 @@
 #include <boost/beast/http/error.hpp>
 #include <boost/beast/http/message.hpp>
 #include <boost/beast/core/detail/clamp.hpp>
-#include <boost/beast/core/detail/type_traits.hpp>
 #include <boost/asio/buffer.hpp>
 #include <boost/optional.hpp>
 #include <cstdint>
diff --git a/include/boost/beast/websocket/detail/decorator.hpp b/include/boost/beast/websocket/detail/decorator.hpp
index b4b512de..03c1c8f6 100644
--- a/include/boost/beast/websocket/detail/decorator.hpp
+++ b/include/boost/beast/websocket/detail/decorator.hpp
@@ -11,7 +11,6 @@
 #define BOOST_BEAST_WEBSOCKET_DETAIL_DECORATOR_HPP
 
 #include <boost/beast/websocket/rfc6455.hpp>
-#include <boost/beast/core/detail/type_traits.hpp>
 #include <boost/core/exchange.hpp>
 #include <boost/type_traits/make_void.hpp>
 #include <algorithm>
diff --git a/include/boost/beast/websocket/impl/accept.hpp b/include/boost/beast/websocket/impl/accept.hpp
index 5402ded0..1e33d8b4 100644
--- a/include/boost/beast/websocket/impl/accept.hpp
+++ b/include/boost/beast/websocket/impl/accept.hpp
@@ -21,7 +21,6 @@
 #include <boost/beast/core/buffer_traits.hpp>
 #include <boost/beast/core/stream_traits.hpp>
 #include <boost/beast/core/detail/buffer.hpp>
-#include <boost/beast/core/detail/type_traits.hpp>
 #include <boost/beast/version.hpp>
 #include <boost/asio/coroutine.hpp>
 #include <boost/asio/post.hpp>
diff --git a/include/boost/beast/websocket/impl/stream.hpp b/include/boost/beast/websocket/impl/stream.hpp
index 12fbf465..6c6a32aa 100644
--- a/include/boost/beast/websocket/impl/stream.hpp
+++ b/include/boost/beast/websocket/impl/stream.hpp
@@ -25,7 +25,6 @@
 #include <boost/beast/core/buffers_suffix.hpp>
 #include <boost/beast/core/flat_static_buffer.hpp>
 #include <boost/beast/core/detail/clamp.hpp>
-#include <boost/beast/core/detail/type_traits.hpp>
 #include <boost/asio/bind_executor.hpp>
 #include <boost/asio/steady_timer.hpp>
 #include <boost/assert.hpp>
diff --git a/include/boost/beast/websocket/impl/stream_impl.hpp b/include/boost/beast/websocket/impl/stream_impl.hpp
index 70740618..2ac771f0 100644
--- a/include/boost/beast/websocket/impl/stream_impl.hpp
+++ b/include/boost/beast/websocket/impl/stream_impl.hpp
@@ -30,7 +30,6 @@
 #include <boost/beast/core/static_buffer.hpp>
 #include <boost/beast/core/stream_traits.hpp>
 #include <boost/beast/core/detail/clamp.hpp>
-#include <boost/beast/core/detail/type_traits.hpp>
 #include <boost/beast/version.hpp>
 #include <boost/asio/bind_executor.hpp>
 #include <boost/asio/steady_timer.hpp>
diff --git a/include/boost/beast/websocket/impl/teardown.hpp b/include/boost/beast/websocket/impl/teardown.hpp
index 1ef28353..2e2f0ad7 100644
--- a/include/boost/beast/websocket/impl/teardown.hpp
+++ b/include/boost/beast/websocket/impl/teardown.hpp
@@ -14,7 +14,7 @@
 #include <boost/beast/core/bind_handler.hpp>
 #include <boost/beast/core/stream_traits.hpp>
 #include <boost/beast/core/detail/bind_continuation.hpp>
-#include <boost/beast/core/detail/type_traits.hpp>
+#include <boost/beast/core/detail/is_invocable.hpp>
 #include <boost/asio/coroutine.hpp>
 #include <boost/asio/post.hpp>
 #include <memory>
diff --git a/include/boost/beast/websocket/option.hpp b/include/boost/beast/websocket/option.hpp
index 62ebfa4a..1133c4e1 100644
--- a/include/boost/beast/websocket/option.hpp
+++ b/include/boost/beast/websocket/option.hpp
@@ -11,15 +11,6 @@
 #define BOOST_BEAST_WEBSOCKET_OPTION_HPP
 
 #include <boost/beast/core/detail/config.hpp>
-#include <boost/beast/websocket/rfc6455.hpp>
-#include <boost/beast/core/detail/type_traits.hpp>
-#include <boost/throw_exception.hpp>
-#include <algorithm>
-#include <cstdint>
-#include <functional>
-#include <stdexcept>
-#include <type_traits>
-#include <utility>
 
 namespace boost {
 namespace beast {
diff --git a/include/boost/beast/websocket/stream.hpp b/include/boost/beast/websocket/stream.hpp
index e6f12a38..367a5453 100644
--- a/include/boost/beast/websocket/stream.hpp
+++ b/include/boost/beast/websocket/stream.hpp
@@ -23,7 +23,6 @@
 #include <boost/beast/core/role.hpp>
 #include <boost/beast/core/stream_traits.hpp>
 #include <boost/beast/core/string.hpp>
-#include <boost/beast/core/detail/type_traits.hpp>
 #include <boost/beast/http/detail/type_traits.hpp>
 #include <boost/asio/async_result.hpp>
 #include <boost/asio/error.hpp>
diff --git a/include/boost/beast/zlib/detail/deflate_stream.hpp b/include/boost/beast/zlib/detail/deflate_stream.hpp
index 74ce6e5a..1460dd42 100644
--- a/include/boost/beast/zlib/detail/deflate_stream.hpp
+++ b/include/boost/beast/zlib/detail/deflate_stream.hpp
@@ -40,7 +40,6 @@
 #include <boost/beast/zlib/error.hpp>
 #include <boost/beast/zlib/zlib.hpp>
 #include <boost/beast/zlib/detail/ranges.hpp>
-#include <boost/beast/core/detail/type_traits.hpp>
 #include <boost/assert.hpp>
 #include <boost/config.hpp>
 #include <boost/optional.hpp>
diff --git a/include/boost/beast/zlib/detail/deflate_stream.ipp b/include/boost/beast/zlib/detail/deflate_stream.ipp
index 6532662e..51698433 100644
--- a/include/boost/beast/zlib/detail/deflate_stream.ipp
+++ b/include/boost/beast/zlib/detail/deflate_stream.ipp
@@ -39,7 +39,6 @@
 
 #include <boost/beast/zlib/detail/deflate_stream.hpp>
 #include <boost/beast/zlib/detail/ranges.hpp>
-#include <boost/beast/core/detail/type_traits.hpp>
 #include <boost/assert.hpp>
 #include <boost/config.hpp>
 #include <boost/make_unique.hpp>
diff --git a/test/beast/core/buffer_traits.cpp b/test/beast/core/buffer_traits.cpp
index 13e1c2cb..ae8b6b6e 100644
--- a/test/beast/core/buffer_traits.cpp
+++ b/test/beast/core/buffer_traits.cpp
@@ -11,7 +11,7 @@
 #include <boost/beast/core/buffer_traits.hpp>
 
 #include <boost/beast/_experimental/unit_test/suite.hpp>
-#include <boost/beast/core/detail/type_traits.hpp>
+#include <boost/beast/core/detail/is_invocable.hpp>
 #include <array>
 
 namespace boost {
diff --git a/test/beast/core/span.cpp b/test/beast/core/span.cpp
index 965d1da2..96b6a774 100644
--- a/test/beast/core/span.cpp
+++ b/test/beast/core/span.cpp
@@ -13,6 +13,8 @@
 #include <boost/beast/core/string.hpp>
 #include <boost/beast/_experimental/unit_test/suite.hpp>
 
+#include <vector>
+
 namespace boost {
 namespace beast {