Skip to content

Commit 4b3f6ff

Browse files
committed
remove move assignment from parser and serializer
1 parent 6e71a82 commit 4b3f6ff

10 files changed

Lines changed: 0 additions & 177 deletions

File tree

include/boost/http_proto/parser.hpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -621,9 +621,6 @@ class parser
621621
BOOST_HTTP_PROTO_DECL
622622
parser(parser&& other) noexcept;
623623

624-
BOOST_HTTP_PROTO_DECL
625-
parser& operator=(parser&& other) noexcept;
626-
627624
BOOST_HTTP_PROTO_DECL
628625
~parser();
629626

include/boost/http_proto/request_parser.hpp

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -107,29 +107,6 @@ class request_parser
107107
request_parser(
108108
request_parser&& other) noexcept = default;
109109

110-
/** Assignment.
111-
112-
The states of `other` are transferred to
113-
`this`, including the allocated buffer.
114-
The previous states of `this` are
115-
destroyed. After assignment, the only
116-
valid operations on the moved-from object
117-
are destruction and assignment.
118-
119-
Buffer sequences previously obtained
120-
using @ref prepare or @ref pull_body
121-
remain valid.
122-
123-
@par Complexity
124-
Constant.
125-
126-
@return A reference to this object.
127-
128-
@param other The parser to assign from.
129-
*/
130-
request_parser& operator=(
131-
request_parser&& other) noexcept = default;
132-
133110
/** Destructor.
134111
135112
Any views or buffers obtained from this

include/boost/http_proto/response_parser.hpp

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -107,29 +107,6 @@ class response_parser
107107
response_parser(
108108
response_parser&& other) noexcept = default;
109109

110-
/** Assignment.
111-
112-
The states of `other` are transferred to
113-
`this`, including the allocated buffer.
114-
The previous states of `this` are
115-
destroyed. After assignment, the only
116-
valid operations on the moved-from object
117-
are destruction and assignemt.
118-
119-
Buffer sequences previously obtained
120-
using @ref prepare or @ref pull_body
121-
remain valid.
122-
123-
@par Complexity
124-
Constant.
125-
126-
@return A reference to this object.
127-
128-
@param other The parser to assign from.
129-
*/
130-
response_parser& operator=(
131-
response_parser&& other) noexcept = default;
132-
133110
/** Destructor.
134111
135112
Any views or buffers obtained from this

include/boost/http_proto/serializer.hpp

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -144,35 +144,6 @@ class serializer
144144
serializer(
145145
serializer&& other) noexcept;
146146

147-
/** Assignment.
148-
149-
The states of `other` are transferred
150-
`this`, which includes the allocated buffer.
151-
The previous state of `this` are destroyed.
152-
After assignment, the only valid
153-
operations on the moved-from object are
154-
destruction and assignment.
155-
156-
Buffer sequences previously obtained
157-
using @ref prepare or @ref stream::prepare
158-
remain valid.
159-
160-
@par Postconditions
161-
@code
162-
other.is_done() == true
163-
@endcode
164-
165-
@par Complexity
166-
Constant.
167-
168-
@param other The serializer to assign from.
169-
@return A reference to this object.
170-
*/
171-
BOOST_HTTP_PROTO_DECL
172-
serializer&
173-
operator=(
174-
serializer&& other) noexcept;
175-
176147
/** Destructor
177148
*/
178149
BOOST_HTTP_PROTO_DECL

src/parser.cpp

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1857,16 +1857,6 @@ parser(parser&& other) noexcept
18571857
other.impl_ = nullptr;
18581858
}
18591859

1860-
parser&
1861-
parser::
1862-
operator=(parser&&other) noexcept
1863-
{
1864-
delete impl_;
1865-
impl_ = other.impl_;
1866-
other.impl_ = nullptr;
1867-
return *this;
1868-
}
1869-
18701860
parser::
18711861
~parser()
18721862
{

src/serializer.cpp

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -958,16 +958,6 @@ serializer(serializer&& other) noexcept
958958
other.impl_ = nullptr;
959959
}
960960

961-
serializer&
962-
serializer::
963-
operator=(serializer&&other) noexcept
964-
{
965-
delete impl_;
966-
impl_ = other.impl_;
967-
other.impl_ = nullptr;
968-
return *this;
969-
}
970-
971961
serializer::
972962
~serializer()
973963
{

test/unit/parser.cpp

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -363,34 +363,6 @@ struct parser_test
363363
BOOST_TEST_EQ(pr2.body(), body);
364364
}
365365

366-
// parser& operator=(parser&&)
367-
{
368-
rts::context ctx;
369-
install_parser_service(ctx, {});
370-
371-
core::string_view header =
372-
"POST / HTTP/1.1\r\n"
373-
"Content-Length: 3\r\n"
374-
"\r\n";
375-
core::string_view body = "123";
376-
pieces in = { header, body };
377-
378-
request_parser pr1(ctx);
379-
request_parser pr2(ctx);
380-
381-
pr1.reset();
382-
pr1.start();
383-
system::error_code ec;
384-
read_header(pr1, in, ec);
385-
386-
pr2 = std::move(pr1);
387-
388-
BOOST_TEST_EQ(pr2.get().buffer(), header);
389-
read(pr2, in, ec);
390-
BOOST_TEST_NOT(ec.failed());
391-
BOOST_TEST_EQ(pr2.body(), body);
392-
}
393-
394366
// ~parser
395367
{
396368
request_parser pr(ctx_);

test/unit/request_parser.cpp

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -215,15 +215,6 @@ struct request_parser_test
215215
request_parser pr1(ctx);
216216
request_parser pr2(std::move(pr1));
217217
}
218-
219-
// request_parser& operator=(request_parser&&)
220-
{
221-
rts::context ctx;
222-
install_parser_service(ctx, {});
223-
request_parser pr1(ctx);
224-
request_parser pr2(ctx);
225-
pr2 = std::move(pr1);
226-
}
227218
}
228219

229220
//--------------------------------------------

test/unit/response_parser.cpp

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,6 @@ class response_parser_test
3838
response_parser pr1(ctx);
3939
response_parser pr2(std::move(pr1));
4040
}
41-
42-
// response_parser& operator=(response_parser&&)
43-
{
44-
rts::context ctx;
45-
install_parser_service(ctx, {});
46-
response_parser pr1(ctx);
47-
response_parser pr2(ctx);
48-
pr2 = std::move(pr1);
49-
}
5041
}
5142

5243
void

test/unit/serializer.cpp

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -253,39 +253,6 @@ struct serializer_test
253253
BOOST_TEST(sr2.is_done());
254254
BOOST_TEST(message == expected);
255255
}
256-
257-
// serializer& operator=(serializer&&)
258-
{
259-
std::string message;
260-
buffers::string_buffer buf(&message);
261-
serializer sr1(ctx);
262-
sr1.start(res);
263-
264-
// consume 5 bytes
265-
{
266-
auto cbs = sr1.prepare().value();
267-
auto n = buffers::copy(buf.prepare(5), cbs);
268-
sr1.consume(n);
269-
buf.commit(n);
270-
BOOST_TEST_EQ(n, 5);
271-
}
272-
273-
serializer sr2(ctx);
274-
sr2 = std::move(sr1);
275-
276-
// consume the reset from sr2
277-
{
278-
auto cbs = sr2.prepare().value();
279-
auto n = buffers::copy(
280-
buf.prepare(buffers::size(cbs)),
281-
cbs);
282-
sr2.consume(n);
283-
buf.commit(n);
284-
}
285-
286-
BOOST_TEST(sr2.is_done());
287-
BOOST_TEST(message == expected);
288-
}
289256
}
290257

291258
//--------------------------------------------

0 commit comments

Comments
 (0)