Skip to content

tonic-build: use unified syntax to clone Arcs #1182

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
merged 1 commit into from
Dec 13, 2022
+11 −11
Merged

tonic-build: use unified syntax to clone Arcs #1182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions tonic-build/src/server.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ pub(crate) fn generate_internal<T: Service>(

impl<T: #server_trait> Clone for _Inner<T> {
fn clone(&self) -> Self {
Self(self.0.clone())
Self(Arc::clone(&self.0))
}
}

Expand Down Expand Up @@ -404,7 +404,7 @@ fn generate_unary<T: Method>(
type Future = BoxFuture<tonic::Response<Self::Response>, tonic::Status>;

fn call(&mut self, request: tonic::Request<#request>) -> Self::Future {
let inner = self.0.clone();
let inner = Arc::clone(&self.0);
let fut = async move {
(*inner).#method_ident(request).await
};
Expand Down Expand Up @@ -456,7 +456,7 @@ fn generate_server_streaming<T: Method>(
type Future = BoxFuture<tonic::Response<Self::ResponseStream>, tonic::Status>;

fn call(&mut self, request: tonic::Request<#request>) -> Self::Future {
let inner = self.0.clone();
let inner = Arc::clone(&self.0);
let fut = async move {
(*inner).#method_ident(request).await
};
Expand Down Expand Up @@ -505,7 +505,7 @@ fn generate_client_streaming<T: Method>(
type Future = BoxFuture<tonic::Response<Self::Response>, tonic::Status>;

fn call(&mut self, request: tonic::Request<tonic::Streaming<#request>>) -> Self::Future {
let inner = self.0.clone();
let inner = Arc::clone(&self.0);
let fut = async move {
(*inner).#method_ident(request).await

Expand Down Expand Up @@ -559,7 +559,7 @@ fn generate_streaming<T: Method>(
type Future = BoxFuture<tonic::Response<Self::ResponseStream>, tonic::Status>;

fn call(&mut self, request: tonic::Request<tonic::Streaming<#request>>) -> Self::Future {
let inner = self.0.clone();
let inner = Arc::clone(&self.0);
let fut = async move {
(*inner).#method_ident(request).await
};
Expand Down
6 changes: 3 additions & 3 deletions 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 @@ -278,7 +278,7 @@ pub mod health_server {
&mut self,
request: tonic::Request<super::HealthCheckRequest>,
) -> Self::Future {
let inner = self.0.clone();
let inner = Arc::clone(&self.0);
let fut = async move { (*inner).check(request).await };
Box::pin(fut)
}
Expand Down Expand Up @@ -317,7 +317,7 @@ pub mod health_server {
&mut self,
request: tonic::Request<super::HealthCheckRequest>,
) -> Self::Future {
let inner = self.0.clone();
let inner = Arc::clone(&self.0);
let fut = async move { (*inner).watch(request).await };
Box::pin(fut)
}
Expand Down Expand Up @@ -366,7 +366,7 @@ pub mod health_server {
}
impl<T: Health> Clone for _Inner<T> {
fn clone(&self) -> Self {
Self(self.0.clone())
Self(Arc::clone(&self.0))
}
}
impl<T: std::fmt::Debug> std::fmt::Debug for _Inner<T> {
Expand Down
4 changes: 2 additions & 2 deletions 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 @@ -337,7 +337,7 @@ pub mod server_reflection_server {
tonic::Streaming<super::ServerReflectionRequest>,
>,
) -> Self::Future {
let inner = self.0.clone();
let inner = Arc::clone(&self.0);
let fut = async move {
(*inner).server_reflection_info(request).await
};
Expand Down Expand Up @@ -388,7 +388,7 @@ pub mod server_reflection_server {
}
impl<T: ServerReflection> Clone for _Inner<T> {
fn clone(&self) -> Self {
Self(self.0.clone())
Self(Arc::clone(&self.0))
}
}
impl<T: std::fmt::Debug> std::fmt::Debug for _Inner<T> {
Expand Down
2 changes: 1 addition & 1 deletion tonic/benches-disabled/benchmarks/compiled_protos/helloworld.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ pub mod server {
&mut self,
request: tonic::Request<super::HelloRequest>,
) -> Self::Future {
let inner = self.0.clone();
let inner = Arc::clone(&self.0);
let fut = async move { inner.say_hello(request).await };
Box::pin(fut)
}
Expand Down