rename http_proto

Author: MungoG

include/boost/beast2/body_write_stream.hpp

@@ -11,7 +11,7 @@
 #define BOOST_BEAST2_BODY_WRITE_STREAM_HPP
 
 #include <boost/asio/async_result.hpp>
-#include <boost/http_proto/serializer.hpp>
+#include <boost/http/serializer.hpp>
 #include <boost/system/error_code.hpp>
 
 #include <utility>
@@ -59,7 +59,7 @@ class body_write_stream_close_op;
         serializer, preventing data loss or duplication.
 
     @see
-        @ref http_proto::serializer.
+        @ref http::serializer.
 */
 template<class AsyncWriteStream>
 class body_write_stream
@@ -98,20 +98,20 @@ class body_write_stream
                   This object's executor is initialized to that of the
                   underlying stream.
 
-        @param sr A http_proto::serializer object which will perform the serialization of
+        @param sr A http::serializer object which will perform the serialization of
                   the HTTP message and extraction of the body.  This must be
                   initialized by the caller and ownership of the serializer is
                   retained by the caller, which must guarantee that it remains
                   valid until the handler is called.
 
-        @param srs A http_proto::serializer::stream object which must have been
+        @param srs A http::serializer::stream object which must have been
                    obtained by a call to `start_stream` on `sr`.  Ownership of
                    the serializer::stream is transferred to this object.
     */
     explicit body_write_stream(
         AsyncWriteStream& s,
-        http_proto::serializer& sr,
-        http_proto::serializer::stream srs);
+        http::serializer& sr,
+        http::serializer::stream srs);
 
     /** Write some data asynchronously.
 
@@ -254,8 +254,8 @@ class body_write_stream
     friend class detail::body_write_stream_close_op;
 
     AsyncWriteStream& stream_;
-    http_proto::serializer& sr_;
-    http_proto::serializer::stream srs_;
+    http::serializer& sr_;
+    http::serializer::stream srs_;
     system::error_code ec_;
 };
 

include/boost/beast2/impl/body_write_stream.hpp

@@ -181,8 +181,8 @@ template<class AsyncWriteStream>
 body_write_stream<AsyncWriteStream>::
 body_write_stream(
     AsyncWriteStream& s,
-    http_proto::serializer& sr,
-    http_proto::serializer::stream srs)
+    http::serializer& sr,
+    http::serializer::stream srs)
     : stream_(s)
     , sr_(sr)
     , srs_(std::move(srs))

test/unit/body_write_stream.cpp

@@ -20,8 +20,8 @@
 #include <boost/capy/async_op.hpp>
 #include <boost/capy/polystore.hpp>
 #include <boost/capy/task.hpp>
-#include <boost/http_proto/response.hpp>
-#include <boost/http_proto/request.hpp>
+#include <boost/http/response.hpp>
+#include <boost/http/request.hpp>
 
 #include "test_helpers.hpp"
 #include <boost/beast2/test/stream.hpp>
@@ -121,8 +121,8 @@ struct ctx_base
 
     ctx_base()
     {
-        http_proto::install_parser_service(capy_ctx_, {});
-        http_proto::install_serializer_service(capy_ctx_, {});
+        http::install_parser_service(capy_ctx_, {});
+        http::install_serializer_service(capy_ctx_, {});
     }
 };
 
@@ -144,7 +144,7 @@ struct single_tester : public ctx_base
     boost::asio::io_context ioc_;
 
     test::stream ts_;
-    http_proto::response_parser pr_;
+    http::response_parser pr_;
 
     // Create a destination buffer
     std::string s_;
@@ -155,9 +155,9 @@ struct single_tester : public ctx_base
 
     test::stream wts_, rts_;
 
-    http_proto::serializer sr_;
+    http::serializer sr_;
 
-    http_proto::response res_;
+    http::response res_;
 
     std::size_t srs_capacity_;
 
@@ -463,9 +463,9 @@ struct single_tester : public ctx_base
         wts.connect(rts);
 
         // Create a fresh serializer for this test
-        http_proto::serializer sr(capy_ctx_);
+        http::serializer sr(capy_ctx_);
         sr.reset();
-        http_proto::response res(header_);
+        http::response res(header_);
 
         // Create a new body_write_stream with the failing stream
         body_write_stream<test::stream> bws(wts, sr, sr.start_stream(res));
@@ -503,9 +503,9 @@ struct single_tester : public ctx_base
         wts.connect(rts);
 
         // Create a fresh serializer for this test
-        http_proto::serializer sr(capy_ctx_);
+        http::serializer sr(capy_ctx_);
         sr.reset();
-        http_proto::response res(header_);
+        http::response res(header_);
 
         // Create a new body_write_stream with the failing stream
         body_write_stream<test::stream> bws(wts, sr, sr.start_stream(res));
@@ -546,9 +546,9 @@ struct single_tester : public ctx_base
         wts.write_size(1);
 
         // Create a fresh serializer for this test
-        http_proto::serializer sr(capy_ctx_);
+        http::serializer sr(capy_ctx_);
         sr.reset();
-        http_proto::response res(header_);
+        http::response res(header_);
 
         // Create a new body_write_stream with the failing stream
         body_write_stream<test::stream> bws(wts, sr, sr.start_stream(res));
@@ -663,8 +663,8 @@ capy::task<void>
 do_coro_write(
     test::stream& wts,
     test::stream& rts,
-    http_proto::serializer& sr,
-    http_proto::serializer::stream srs,
+    http::serializer& sr,
+    http::serializer::stream srs,
     std::string const& body,
     std::string const& expected_msg)
 {
@@ -701,8 +701,8 @@ test_coroutine()
 {
     // Set up context with parser and serializer services
     capy::polystore capy_ctx;
-    http_proto::install_parser_service(capy_ctx, {});
-    http_proto::install_serializer_service(capy_ctx, {});
+    http::install_parser_service(capy_ctx, {});
+    http::install_serializer_service(capy_ctx, {});
 
     std::string body = "Hello World!";
     std::string header =
@@ -717,10 +717,10 @@ test_coroutine()
     test::stream rts(ioc);
     wts.connect(rts);
 
-    http_proto::serializer sr(capy_ctx);
+    http::serializer sr(capy_ctx);
     sr.reset();
 
-    http_proto::response res(header);
+    http::response res(header);
     auto srs = sr.start_stream(res);
 
     capy::spawn(