Skip to content

Commit

Permalink
fix rebase
Browse files Browse the repository at this point in the history
  • Loading branch information
Quentin Perez committed Sep 21, 2023
1 parent 23ab9e2 commit 0510e60
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions tests/compression/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ paste = "1.0.12"
pin-project = "1.0"
prost = "0.12"
tokio = {version = "1.0", features = ["macros", "rt-multi-thread", "net"]}
tokio-stream = "0.1"
tonic = {path = "../../tonic", features = ["gzip", "zstd"]}
tower = {version = "0.4", features = []}
tower-http = {version = "0.4", features = ["map-response-body", "map-request-body"]}
Expand Down
2 changes: 1 addition & 1 deletion tests/compression/src/compressing_request.rs
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ async fn client_enabled_server_enabled_multi_encoding(encoding: CompressionEncod
.into_inner(),
)
.add_service(svc)
.serve_with_incoming(futures::stream::iter(vec![Ok::<_, std::io::Error>(server)]))
.serve_with_incoming(tokio_stream::iter(vec![Ok::<_, std::io::Error>(server)]))
.await
.unwrap();
}
Expand Down

0 comments on commit 0510e60

Please sign in to comment.