Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: hyperium/tonic
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v0.8.3
Choose a base ref
...
head repository: hyperium/tonic
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v0.8.4
Choose a head ref
  • 4 commits
  • 8 files changed
  • 3 contributors

Commits on Nov 29, 2022

  1. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    8318e75 View commit details
  2. Verified

    This commit was signed with the committer’s verified signature.
    darinpope Darin Pope
    Copy the full SHA
    076a81c View commit details
  3. Copy the full SHA
    c7476ff View commit details
  4. Copy the full SHA
    d6f0567 View commit details
Showing with 27 additions and 15 deletions.
  1. +12 −0 CHANGELOG.md
  2. +1 −1 examples/Cargo.toml
  3. +1 −1 interop/Cargo.toml
  4. +2 −2 tonic-build/Cargo.toml
  5. +3 −3 tonic-build/src/code_gen.rs
  6. +2 −2 tonic-build/src/lib.rs
  7. +3 −3 tonic-build/src/manual.rs
  8. +3 −3 tonic-build/src/prost.rs
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,17 @@
# [v0.8.4](https://github.com/hyperium/tonic/compare/v0.8.3...v0.8.4) (2022-11-29)

This release only contains a release for `tonic-build`.

### Bug Fixes

* **build:** Fix CodeGen8uilder typo ([#1165](https://github.com/hyperium/tonic/issues/1165)) ([#1166](https://github.com/hyperium/tonic/issues/1166)) ([c7476ff](https://github.com/hyperium/tonic/commit/c7476fff425b972c7966228fd38a9191e8d2ddc9))


# [v0.8.3](https://github.com/hyperium/tonic/compare/v0.8.2...v0.8.3) (2022-11-28)

**note:** this version has been yanked due to a typo in the `CodeGenBuilder`
type.

Included in this release is also the sub-crate major version bumps:

* `tonic-health` has been bumped to `0.8.0`
2 changes: 1 addition & 1 deletion examples/Cargo.toml
Original file line number Diff line number Diff line change
@@ -222,7 +222,7 @@ warp = "0.3"
# Health example
tonic-health = { path = "../tonic-health" }
# Reflection example
listenfd = "0.3"
listenfd = "1.0"
tonic-reflection = { path = "../tonic-reflection" }
# grpc-web example
bytes = "1"
2 changes: 1 addition & 1 deletion interop/Cargo.toml
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@ path = "src/bin/server.rs"
async-stream = "0.3"
bytes = "1.0"
clap = {version = "4.0.26", features = ["derive"]}
console = "0.14"
console = "0.15"
futures-core = "0.3"
futures-util = "0.3"
http = "0.2"
4 changes: 2 additions & 2 deletions tonic-build/Cargo.toml
Original file line number Diff line number Diff line change
@@ -4,15 +4,15 @@ categories = ["network-programming", "asynchronous"]
description = """
Codegen module of `tonic` gRPC implementation.
"""
documentation = "https://docs.rs/tonic-build/0.8.2/tonic_build/"
documentation = "https://docs.rs/tonic-build/0.8.4/tonic_build/"
edition = "2018"
homepage = "https://github.com/hyperium/tonic"
keywords = ["rpc", "grpc", "async", "codegen", "protobuf"]
license = "MIT"
name = "tonic-build"
readme = "README.md"
repository = "https://github.com/hyperium/tonic"
version = "0.8.3"
version = "0.8.4"

[dependencies]
prettyplease = { version = "0.1" }
6 changes: 3 additions & 3 deletions tonic-build/src/code_gen.rs
Original file line number Diff line number Diff line change
@@ -6,15 +6,15 @@ use crate::{Attributes, Service};

/// Builder for the generic code generation of server and clients.
#[derive(Debug)]
pub struct CodeGen8uilder {
pub struct CodeGenBuilder {
emit_package: bool,
compile_well_known_types: bool,
attributes: Attributes,
build_transport: bool,
disable_comments: HashSet<String>,
}

impl CodeGen8uilder {
impl CodeGenBuilder {
/// Create a new code gen builder with default options.
pub fn new() -> Self {
Default::default()
@@ -89,7 +89,7 @@ impl CodeGen8uilder {
}
}

impl Default for CodeGen8uilder {
impl Default for CodeGenBuilder {
fn default() -> Self {
Self {
emit_package: true,
4 changes: 2 additions & 2 deletions tonic-build/src/lib.rs
Original file line number Diff line number Diff line change
@@ -70,7 +70,7 @@
html_logo_url = "https://raw.githubusercontent.com/tokio-rs/website/master/public/img/icons/tonic.svg"
)]
#![deny(rustdoc::broken_intra_doc_links)]
#![doc(html_root_url = "https://docs.rs/tonic-build/0.8.3")]
#![doc(html_root_url = "https://docs.rs/tonic-build/0.8.4")]
#![doc(issue_tracker_base_url = "https://github.com/hyperium/tonic/issues/")]
#![doc(test(no_crate_inject, attr(deny(rust_2018_idioms))))]
#![cfg_attr(docsrs, feature(doc_cfg))]
@@ -95,7 +95,7 @@ pub mod client;
pub mod server;

mod code_gen;
pub use code_gen::CodeGen8uilder;
pub use code_gen::CodeGenBuilder;

/// Service generation trait.
///
6 changes: 3 additions & 3 deletions tonic-build/src/manual.rs
Original file line number Diff line number Diff line change
@@ -28,7 +28,7 @@
//! }
//! ```
use crate::code_gen::CodeGen8uilder;
use crate::code_gen::CodeGenBuilder;

use proc_macro2::TokenStream;
use quote::ToTokens;
@@ -352,7 +352,7 @@ struct ServiceGenerator {
impl ServiceGenerator {
fn generate(&mut self, service: &Service) {
if self.builder.build_server {
let server = CodeGen8uilder::new()
let server = CodeGenBuilder::new()
.emit_package(true)
.compile_well_known_types(false)
.generate_server(service, "");
@@ -361,7 +361,7 @@ impl ServiceGenerator {
}

if self.builder.build_client {
let client = CodeGen8uilder::new()
let client = CodeGenBuilder::new()
.emit_package(true)
.compile_well_known_types(false)
.build_transport(self.builder.build_transport)
6 changes: 3 additions & 3 deletions tonic-build/src/prost.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use crate::code_gen::CodeGen8uilder;
use crate::code_gen::CodeGenBuilder;

use super::Attributes;
use proc_macro2::TokenStream;
@@ -161,7 +161,7 @@ impl ServiceGenerator {
impl prost_build::ServiceGenerator for ServiceGenerator {
fn generate(&mut self, service: prost_build::Service, _buf: &mut String) {
if self.builder.build_server {
let server = CodeGen8uilder::new()
let server = CodeGenBuilder::new()
.emit_package(self.builder.emit_package)
.compile_well_known_types(self.builder.compile_well_known_types)
.attributes(self.builder.server_attributes.clone())
@@ -172,7 +172,7 @@ impl prost_build::ServiceGenerator for ServiceGenerator {
}

if self.builder.build_client {
let client = CodeGen8uilder::new()
let client = CodeGenBuilder::new()
.emit_package(self.builder.emit_package)
.compile_well_known_types(self.builder.compile_well_known_types)
.attributes(self.builder.client_attributes.clone())