Skip to content

Commit f089e7a

Browse files
tottototottoto
authored
chore: Refactor use of tokio-stream (#1560)
1 parent b3fca19 commit f089e7a

File tree

11 files changed

+29
-31
lines changed

11 files changed

+29
-31
lines changed

‎examples/src/mock/mock.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
2323
tokio::spawn(async move {
2424
Server::builder()
2525
.add_service(GreeterServer::new(greeter))
26-
.serve_with_incoming(tokio_stream::iter(vec![Ok::<_, std::io::Error>(server)]))
26+
.serve_with_incoming(tokio_stream::once(Ok::<_, std::io::Error>(server)))
2727
.await
2828
});
2929

‎interop/src/client.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ pub async fn ping_pong(client: &mut TestClient, assertions: &mut Vec<TestAsserti
207207
}
208208

209209
pub async fn empty_stream(client: &mut TestClient, assertions: &mut Vec<TestAssertion>) {
210-
let stream = tokio_stream::iter(Vec::new());
210+
let stream = tokio_stream::empty();
211211
let result = client.full_duplex_call(Request::new(stream)).await;
212212

213213
assertions.push(test_assert!(
@@ -270,7 +270,7 @@ pub async fn status_code_and_message(client: &mut TestClient, assertions: &mut V
270270
let result = client.unary_call(Request::new(simple_req)).await;
271271
validate_response(result, assertions);
272272

273-
let stream = tokio_stream::iter(vec![duplex_req]);
273+
let stream = tokio_stream::once(duplex_req);
274274
let result = match client.full_duplex_call(Request::new(stream)).await {
275275
Ok(response) => {
276276
let stream = response.into_inner();
@@ -356,7 +356,7 @@ pub async fn custom_metadata(client: &mut TestClient, assertions: &mut Vec<TestA
356356
req_unary.metadata_mut().insert(key1, value1.clone());
357357
req_unary.metadata_mut().insert_bin(key2, value2.clone());
358358

359-
let stream = tokio_stream::iter(vec![make_ping_pong_request(0)]);
359+
let stream = tokio_stream::once(make_ping_pong_request(0));
360360
let mut req_stream = Request::new(stream);
361361
req_stream.metadata_mut().insert(key1, value1.clone());
362362
req_stream.metadata_mut().insert_bin(key2, value2.clone());

‎interop/src/server.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ impl pb::test_service_server::TestService for TestService {
115115
return Err(status);
116116
}
117117

118-
let single_message = tokio_stream::iter(vec![Ok(first_msg)]);
118+
let single_message = tokio_stream::once(Ok(first_msg));
119119
let mut stream = single_message.chain(stream);
120120

121121
let stream = try_stream! {

‎tests/compression/src/bidirectional_stream.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ async fn client_enabled_server_enabled() {
3737
.into_inner(),
3838
)
3939
.add_service(svc)
40-
.serve_with_incoming(tokio_stream::iter(vec![Ok::<_, std::io::Error>(server)]))
40+
.serve_with_incoming(tokio_stream::once(Ok::<_, std::io::Error>(server)))
4141
.await
4242
.unwrap();
4343
}

‎tests/compression/src/client_stream.rs‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ async fn client_enabled_server_enabled() {
2929
.into_inner(),
3030
)
3131
.add_service(svc)
32-
.serve_with_incoming(tokio_stream::iter(vec![Ok::<_, std::io::Error>(server)]))
32+
.serve_with_incoming(tokio_stream::once(Ok::<_, std::io::Error>(server)))
3333
.await
3434
.unwrap();
3535
}
@@ -75,7 +75,7 @@ async fn client_disabled_server_enabled() {
7575
.into_inner(),
7676
)
7777
.add_service(svc)
78-
.serve_with_incoming(tokio_stream::iter(vec![Ok::<_, std::io::Error>(server)]))
78+
.serve_with_incoming(tokio_stream::once(Ok::<_, std::io::Error>(server)))
7979
.await
8080
.unwrap();
8181
}
@@ -102,7 +102,7 @@ async fn client_enabled_server_disabled() {
102102
tokio::spawn(async move {
103103
Server::builder()
104104
.add_service(svc)
105-
.serve_with_incoming(tokio_stream::iter(vec![Ok::<_, std::io::Error>(server)]))
105+
.serve_with_incoming(tokio_stream::once(Ok::<_, std::io::Error>(server)))
106106
.await
107107
.unwrap();
108108
});
@@ -147,7 +147,7 @@ async fn compressing_response_from_client_stream() {
147147
.into_inner(),
148148
)
149149
.add_service(svc)
150-
.serve_with_incoming(tokio_stream::iter(vec![Ok::<_, std::io::Error>(server)]))
150+
.serve_with_incoming(tokio_stream::once(Ok::<_, std::io::Error>(server)))
151151
.await
152152
.unwrap();
153153
}
@@ -156,8 +156,7 @@ async fn compressing_response_from_client_stream() {
156156
let mut client = test_client::TestClient::new(mock_io_channel(client).await)
157157
.accept_compressed(CompressionEncoding::Gzip);
158158

159-
let stream = tokio_stream::iter(vec![]);
160-
let req = Request::new(Box::pin(stream));
159+
let req = Request::new(Box::pin(tokio_stream::empty()));
161160

162161
let res = client.compress_output_client_stream(req).await.unwrap();
163162
assert_eq!(res.metadata().get("grpc-encoding").unwrap(), "gzip");

‎tests/compression/src/compressing_request.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ async fn client_enabled_server_enabled() {
3131
.into_inner(),
3232
)
3333
.add_service(svc)
34-
.serve_with_incoming(tokio_stream::iter(vec![Ok::<_, std::io::Error>(server)]))
34+
.serve_with_incoming(tokio_stream::once(Ok::<_, std::io::Error>(server)))
3535
.await
3636
.unwrap();
3737
}
@@ -61,7 +61,7 @@ async fn client_enabled_server_disabled() {
6161
tokio::spawn(async move {
6262
Server::builder()
6363
.add_service(svc)
64-
.serve_with_incoming(tokio_stream::iter(vec![Ok::<_, std::io::Error>(server)]))
64+
.serve_with_incoming(tokio_stream::once(Ok::<_, std::io::Error>(server)))
6565
.await
6666
.unwrap();
6767
});
@@ -99,7 +99,7 @@ async fn client_mark_compressed_without_header_server_enabled() {
9999
async move {
100100
Server::builder()
101101
.add_service(svc)
102-
.serve_with_incoming(tokio_stream::iter(vec![Ok::<_, std::io::Error>(server)]))
102+
.serve_with_incoming(tokio_stream::once(Ok::<_, std::io::Error>(server)))
103103
.await
104104
.unwrap();
105105
}

‎tests/compression/src/compressing_response.rs‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ async fn client_enabled_server_enabled() {
5353
.into_inner(),
5454
)
5555
.add_service(svc)
56-
.serve_with_incoming(tokio_stream::iter(vec![Ok::<_, std::io::Error>(server)]))
56+
.serve_with_incoming(tokio_stream::once(Ok::<_, std::io::Error>(server)))
5757
.await
5858
.unwrap();
5959
}
@@ -94,7 +94,7 @@ async fn client_enabled_server_disabled() {
9494
.into_inner(),
9595
)
9696
.add_service(svc)
97-
.serve_with_incoming(tokio_stream::iter(vec![Ok::<_, std::io::Error>(server)]))
97+
.serve_with_incoming(tokio_stream::once(Ok::<_, std::io::Error>(server)))
9898
.await
9999
.unwrap();
100100
}
@@ -160,7 +160,7 @@ async fn client_disabled() {
160160
.into_inner(),
161161
)
162162
.add_service(svc)
163-
.serve_with_incoming(tokio_stream::iter(vec![Ok::<_, std::io::Error>(server)]))
163+
.serve_with_incoming(tokio_stream::once(Ok::<_, std::io::Error>(server)))
164164
.await
165165
.unwrap();
166166
}
@@ -198,7 +198,7 @@ async fn server_replying_with_unsupported_encoding() {
198198
.into_inner(),
199199
)
200200
.add_service(svc)
201-
.serve_with_incoming(tokio_stream::iter(vec![Ok::<_, std::io::Error>(server)]))
201+
.serve_with_incoming(tokio_stream::once(Ok::<_, std::io::Error>(server)))
202202
.await
203203
.unwrap();
204204
});
@@ -240,7 +240,7 @@ async fn disabling_compression_on_single_response() {
240240
.into_inner(),
241241
)
242242
.add_service(svc)
243-
.serve_with_incoming(tokio_stream::iter(vec![Ok::<_, std::io::Error>(server)]))
243+
.serve_with_incoming(tokio_stream::once(Ok::<_, std::io::Error>(server)))
244244
.await
245245
.unwrap();
246246
}
@@ -281,7 +281,7 @@ async fn disabling_compression_on_response_but_keeping_compression_on_stream() {
281281
.into_inner(),
282282
)
283283
.add_service(svc)
284-
.serve_with_incoming(tokio_stream::iter(vec![Ok::<_, std::io::Error>(server)]))
284+
.serve_with_incoming(tokio_stream::once(Ok::<_, std::io::Error>(server)))
285285
.await
286286
.unwrap();
287287
}
@@ -337,7 +337,7 @@ async fn disabling_compression_on_response_from_client_stream() {
337337
.into_inner(),
338338
)
339339
.add_service(svc)
340-
.serve_with_incoming(tokio_stream::iter(vec![Ok::<_, std::io::Error>(server)]))
340+
.serve_with_incoming(tokio_stream::once(Ok::<_, std::io::Error>(server)))
341341
.await
342342
.unwrap();
343343
}
@@ -346,8 +346,7 @@ async fn disabling_compression_on_response_from_client_stream() {
346346
let mut client = test_client::TestClient::new(mock_io_channel(client).await)
347347
.accept_compressed(CompressionEncoding::Gzip);
348348

349-
let stream = tokio_stream::iter(vec![]);
350-
let req = Request::new(Box::pin(stream));
349+
let req = Request::new(Box::pin(tokio_stream::empty()));
351350

352351
let res = client.compress_output_client_stream(req).await.unwrap();
353352
assert_eq!(res.metadata().get("grpc-encoding").unwrap(), "gzip");

‎tests/compression/src/server_stream.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ async fn client_enabled_server_enabled() {
2626
.into_inner(),
2727
)
2828
.add_service(svc)
29-
.serve_with_incoming(tokio_stream::iter(vec![Ok::<_, std::io::Error>(server)]))
29+
.serve_with_incoming(tokio_stream::once(Ok::<_, std::io::Error>(server)))
3030
.await
3131
.unwrap();
3232
}
@@ -80,7 +80,7 @@ async fn client_disabled_server_enabled() {
8080
.into_inner(),
8181
)
8282
.add_service(svc)
83-
.serve_with_incoming(tokio_stream::iter(vec![Ok::<_, std::io::Error>(server)]))
83+
.serve_with_incoming(tokio_stream::once(Ok::<_, std::io::Error>(server)))
8484
.await
8585
.unwrap();
8686
}
@@ -125,7 +125,7 @@ async fn client_enabled_server_disabled() {
125125
.into_inner(),
126126
)
127127
.add_service(svc)
128-
.serve_with_incoming(tokio_stream::iter(vec![Ok::<_, std::io::Error>(server)]))
128+
.serve_with_incoming(tokio_stream::once(Ok::<_, std::io::Error>(server)))
129129
.await
130130
.unwrap();
131131
}

‎tests/integration_tests/tests/max_message_size.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ async fn response_stream_limit() {
148148
tokio::spawn(async move {
149149
Server::builder()
150150
.add_service(svc)
151-
.serve_with_incoming(tokio_stream::iter(vec![Ok::<_, std::io::Error>(server)]))
151+
.serve_with_incoming(tokio_stream::once(Ok::<_, std::io::Error>(server)))
152152
.await
153153
.unwrap();
154154
});
@@ -317,7 +317,7 @@ async fn max_message_run(case: &TestCase) -> Result<(), Status> {
317317
tokio::spawn(async move {
318318
Server::builder()
319319
.add_service(svc)
320-
.serve_with_incoming(tokio_stream::iter(vec![Ok::<_, std::io::Error>(server)]))
320+
.serve_with_incoming(tokio_stream::once(Ok::<_, std::io::Error>(server)))
321321
.await
322322
.unwrap();
323323
});

‎tests/integration_tests/tests/routes_builder.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ async fn multiple_service_using_routes_builder() {
4343
let output = Output1 {
4444
buf: request.into_inner().buf,
4545
};
46-
let stream = tokio_stream::iter(vec![Ok(output)]);
46+
let stream = tokio_stream::once(Ok(output));
4747

4848
Ok(Response::new(Box::pin(stream)))
4949
}

0 commit comments

Comments
 (0)