Skip to content

fix(codegen): Use stream type from codegen mod #1446

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
LucioFranco merged 2 commits into from
Aug 2, 2023
Merged

fix(codegen): Use stream type from codegen mod #1446

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cbee18c
fix(codegen): Use stream type from codegen mod
LucioFranco Aug 2, 2023
45d256e
Add generated code
LucioFranco Aug 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions tonic-build/src/server.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ fn generate_trait_methods<T: Service>(

quote! {
#stream_doc
type #stream: tokio_stream::Stream<Item = std::result::Result<#res_message, tonic::Status>> + Send + 'static;
type #stream: tonic::codegen::tokio_stream::Stream<Item = std::result::Result<#res_message, tonic::Status>> + Send + 'static;

#method_doc
async fn #name(#self_param, request: tonic::Request<#req_message>)
Expand All @@ -329,7 +329,7 @@ fn generate_trait_methods<T: Service>(

quote! {
#stream_doc
type #stream: tokio_stream::Stream<Item = std::result::Result<#res_message, tonic::Status>> + Send + 'static;
type #stream: tonic::codegen::tokio_stream::Stream<Item = std::result::Result<#res_message, tonic::Status>> + Send + 'static;

#method_doc
async fn #name(#self_param, request: tonic::Request<tonic::Streaming<#req_message>>)
Expand Down
2 changes: 1 addition & 1 deletion tonic-health/src/generated/grpc.health.v1.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ pub mod health_server {
tonic::Status,
>;
/// Server streaming response type for the Watch method.
type WatchStream: tokio_stream::Stream<
type WatchStream: tonic::codegen::tokio_stream::Stream<
Item = std::result::Result<super::HealthCheckResponse, tonic::Status>,
>
+ Send
Expand Down
2 changes: 1 addition & 1 deletion tonic-reflection/src/generated/grpc.reflection.v1alpha.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ pub mod server_reflection_server {
#[async_trait]
pub trait ServerReflection: Send + Sync + 'static {
/// Server streaming response type for the ServerReflectionInfo method.
type ServerReflectionInfoStream: tokio_stream::Stream<
type ServerReflectionInfoStream: tonic::codegen::tokio_stream::Stream<
Item = std::result::Result<
super::ServerReflectionResponse,
tonic::Status,
Expand Down