Skip to content

Commit

Permalink
feedback, clean up straggler changes
Browse files Browse the repository at this point in the history
  • Loading branch information
kvcache committed Feb 15, 2024
1 parent d67ee7a commit 6176e9a
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 23 deletions.
8 changes: 0 additions & 8 deletions examples/src/json-codec/common.rs
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,6 @@ impl<T: serde::Serialize> Encoder for JsonEncoder<T> {
fn encode(&mut self, item: Self::Item, buf: &mut EncodeBuf<'_>) -> Result<(), Self::Error> {
serde_json::to_writer(buf.writer(), &item).map_err(|e| Status::internal(e.to_string()))
}

fn buffer_settings(&self) -> tonic::codec::BufferSettings {
Default::default()
}
}

#[derive(Debug)]
Expand All @@ -52,10 +48,6 @@ impl<U: serde::de::DeserializeOwned> Decoder for JsonDecoder<U> {
serde_json::from_reader(buf.reader()).map_err(|e| Status::internal(e.to_string()))?;
Ok(Some(item))
}

fn buffer_settings(&self) -> tonic::codec::BufferSettings {
Default::default()
}
}

/// A [`Codec`] that implements `application/grpc+json` via the serde library.
Expand Down
8 changes: 4 additions & 4 deletions tonic-build/src/client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ fn generate_unary<T: Service>(
proto_path: &str,
compile_well_known_types: bool,
) -> TokenStream {
let codec_name = syn::parse_str::<syn::Path>(&method.codec_path()).unwrap();
let codec_name = syn::parse_str::<syn::Path>(method.codec_path()).unwrap();
let ident = format_ident!("{}", method.name());
let (request, response) = method.request_response_name(proto_path, compile_well_known_types);
let service_name = format_service_name(service, emit_package);
Expand Down Expand Up @@ -252,7 +252,7 @@ fn generate_server_streaming<T: Service>(
proto_path: &str,
compile_well_known_types: bool,
) -> TokenStream {
let codec_name = syn::parse_str::<syn::Path>(&method.codec_path()).unwrap();
let codec_name = syn::parse_str::<syn::Path>(method.codec_path()).unwrap();
let ident = format_ident!("{}", method.name());
let (request, response) = method.request_response_name(proto_path, compile_well_known_types);
let service_name = format_service_name(service, emit_package);
Expand Down Expand Up @@ -283,7 +283,7 @@ fn generate_client_streaming<T: Service>(
proto_path: &str,
compile_well_known_types: bool,
) -> TokenStream {
let codec_name = syn::parse_str::<syn::Path>(&method.codec_path()).unwrap();
let codec_name = syn::parse_str::<syn::Path>(method.codec_path()).unwrap();
let ident = format_ident!("{}", method.name());
let (request, response) = method.request_response_name(proto_path, compile_well_known_types);
let service_name = format_service_name(service, emit_package);
Expand Down Expand Up @@ -314,7 +314,7 @@ fn generate_streaming<T: Service>(
proto_path: &str,
compile_well_known_types: bool,
) -> TokenStream {
let codec_name = syn::parse_str::<syn::Path>(&method.codec_path()).unwrap();
let codec_name = syn::parse_str::<syn::Path>(method.codec_path()).unwrap();
let ident = format_ident!("{}", method.name());
let (request, response) = method.request_response_name(proto_path, compile_well_known_types);
let service_name = format_service_name(service, emit_package);
Expand Down
2 changes: 2 additions & 0 deletions tonic-build/src/compile_settings.rs
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
#[derive(Debug, Clone)]
pub(crate) struct CompileSettings {
#[cfg(feature = "prost")]
pub(crate) codec_path: String,
}

impl Default for CompileSettings {
fn default() -> Self {
Self {
#[cfg(feature = "prost")]
codec_path: "tonic::codec::ProstCodec".to_string(),
}
}
Expand Down
1 change: 0 additions & 1 deletion tonic-build/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,6 @@ mod code_gen;
pub use code_gen::CodeGenBuilder;

mod compile_settings;
pub(crate) use compile_settings::CompileSettings;

/// Service generation trait.
///
Expand Down
2 changes: 1 addition & 1 deletion tonic-build/src/prost.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use crate::{code_gen::CodeGenBuilder, CompileSettings};
use crate::{code_gen::CodeGenBuilder, compile_settings::CompileSettings};

use super::Attributes;
use proc_macro2::TokenStream;
Expand Down
8 changes: 4 additions & 4 deletions tonic-build/src/server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -457,7 +457,7 @@ fn generate_unary<T: Method>(
server_trait: Ident,
use_arc_self: bool,
) -> TokenStream {
let codec_name = syn::parse_str::<syn::Path>(&method.codec_path()).unwrap();
let codec_name = syn::parse_str::<syn::Path>(method.codec_path()).unwrap();

let service_ident = quote::format_ident!("{}Svc", method.identifier());

Expand Down Expand Up @@ -517,7 +517,7 @@ fn generate_server_streaming<T: Method>(
use_arc_self: bool,
generate_default_stubs: bool,
) -> TokenStream {
let codec_name = syn::parse_str::<syn::Path>(&method.codec_path()).unwrap();
let codec_name = syn::parse_str::<syn::Path>(method.codec_path()).unwrap();

let service_ident = quote::format_ident!("{}Svc", method.identifier());

Expand Down Expand Up @@ -587,7 +587,7 @@ fn generate_client_streaming<T: Method>(
let service_ident = quote::format_ident!("{}Svc", method.identifier());

let (request, response) = method.request_response_name(proto_path, compile_well_known_types);
let codec_name = syn::parse_str::<syn::Path>(&method.codec_path()).unwrap();
let codec_name = syn::parse_str::<syn::Path>(method.codec_path()).unwrap();

let inner_arg = if use_arc_self {
quote!(inner)
Expand Down Expand Up @@ -644,7 +644,7 @@ fn generate_streaming<T: Method>(
use_arc_self: bool,
generate_default_stubs: bool,
) -> TokenStream {
let codec_name = syn::parse_str::<syn::Path>(&method.codec_path()).unwrap();
let codec_name = syn::parse_str::<syn::Path>(method.codec_path()).unwrap();

let service_ident = quote::format_ident!("{}Svc", method.identifier());

Expand Down
4 changes: 0 additions & 4 deletions tonic/benches/decode.rs
Original file line number Diff line number Diff line change
Expand Up @@ -105,10 +105,6 @@ impl Decoder for MockDecoder {
buf.advance(self.message_size);
Ok(Some(out))
}

fn buffer_settings(&self) -> tonic::codec::BufferSettings {
Default::default()
}
}

fn make_payload(message_length: usize, message_count: usize) -> Bytes {
Expand Down
2 changes: 1 addition & 1 deletion tonic/src/codec/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ const DEFAULT_YIELD_THRESHOLD: usize = 32 * 1024;
/// Buffer size defaults to 8KiB.
///
/// Example:
/// ```
/// ```ignore
/// Buffer start: | 8kb |
/// Message received: | 24612 bytes |
/// Buffer grows: | 8kb | 8kb | 8kb | 8kb |
Expand Down

0 comments on commit 6176e9a

Please sign in to comment.