Skip to content
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

chore(deps): bump prost to 0.12 #636

Closed
wants to merge 4 commits into from
Closed

chore(deps): bump prost to 0.12 #636

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
239fbad
chore(deps): bump prost to 0.12
waynexia Oct 25, 2023
0d10390
run cargo xtask codegen
waynexia Nov 7, 2023
e900158
fix clippy lints
waynexia Nov 7, 2023
be642b8
fix compile errors
waynexia Nov 7, 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
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ futures-executor = "0.3"
futures-util = { version = "0.3", default-features = false, features = ["std", "sink"] }
protobuf = { version = "2.0", optional = true }
protobufv3 = { package = "protobuf", version = "3.2", optional = true }
prost = { version = "0.11", optional = true }
prost = { version = "0.12", optional = true }
bytes = { version = "1.0", optional = true }
log = "0.4"
parking_lot = "0.12"
Expand Down
1 change: 1 addition & 0 deletions grpc-sys/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,5 @@ mod bindings {
mod grpc_wrap;

pub use bindings::*;
#[allow(unused_imports)]
pub use grpc_wrap::*;
18 changes: 14 additions & 4 deletions health/src/proto/protobuf_v3/health.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// This file is generated by rust-protobuf 3.2.0. Do not edit
// This file is generated by rust-protobuf 3.3.0. Do not edit
// @generated

// https://github.com/rust-lang/rust-clippy/issues/702
Expand All @@ -22,10 +22,10 @@

/// Generated files are compatible only with the same version
/// of protobuf runtime.
const _PROTOBUF_VERSION_CHECK: () = ::protobufv3::VERSION_3_2_0;
const _PROTOBUF_VERSION_CHECK: () = ::protobufv3::VERSION_3_3_0;

#[derive(PartialEq,Clone,Default,Debug)]
// @@protoc_insertion_point(message:grpc.health.v1.HealthCheckRequest)
#[derive(PartialEq,Clone,Default,Debug)]
pub struct HealthCheckRequest {
// message fields
// @@protoc_insertion_point(field:grpc.health.v1.HealthCheckRequest.service)
Expand Down Expand Up @@ -146,8 +146,8 @@ impl ::protobufv3::reflect::ProtobufValue for HealthCheckRequest {
type RuntimeType = ::protobufv3::reflect::rt::RuntimeTypeMessage<Self>;
}

#[derive(PartialEq,Clone,Default,Debug)]
// @@protoc_insertion_point(message:grpc.health.v1.HealthCheckResponse)
#[derive(PartialEq,Clone,Default,Debug)]
pub struct HealthCheckResponse {
// message fields
// @@protoc_insertion_point(field:grpc.health.v1.HealthCheckResponse.status)
Expand Down Expand Up @@ -300,6 +300,16 @@ pub mod health_check_response {
}
}

fn from_str(str: &str) -> ::std::option::Option<ServingStatus> {
match str {
"Unknown" => ::std::option::Option::Some(ServingStatus::Unknown),
"Serving" => ::std::option::Option::Some(ServingStatus::Serving),
"NotServing" => ::std::option::Option::Some(ServingStatus::NotServing),
"ServiceUnknown" => ::std::option::Option::Some(ServingStatus::ServiceUnknown),
_ => ::std::option::Option::None
}
}

const VALUES: &'static [ServingStatus] = &[
ServingStatus::Unknown,
ServingStatus::Serving,
Expand Down
2 changes: 1 addition & 1 deletion interop/src/client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ impl Client {

pub async fn server_streaming(&self) -> grpcio::Result<()> {
print!("testing server streaming ... ");
let sizes = vec![31415, 9, 2653, 58979];
let sizes = [31415, 9, 2653, 58979];
let req = StreamingOutputCallRequest {
response_parameters: sizes
.iter()
Expand Down
8 changes: 4 additions & 4 deletions proto/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ prost-codec = ["prost-build", "prost-derive", "prost-types", "bytes", "lazy_stat
[dependencies]
grpcio = { path = "..", features = ["boringssl"], version = "0.13.0", default-features = false }
bytes = { version = "1.0", optional = true }
prost = { version = "0.11", optional = true }
prost-derive = { version = "0.11", optional = true }
prost-types = { version = "0.11", optional = true }
prost = { version = "0.12", optional = true }
prost-derive = { version = "0.12", optional = true }
prost-types = { version = "0.12", optional = true }
protobuf = { version = "2", optional = true }
protobufv3 = { package = "protobuf", version = "3.2", optional = true }
lazy_static = { version = "1.3", optional = true }

[build-dependencies]
prost-build = { version = "0.11", optional = true }
prost-build = { version = "0.12", optional = true }
walkdir = "2.2"
8 changes: 4 additions & 4 deletions proto/src/proto/protobuf_v3/example/helloworld.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// This file is generated by rust-protobuf 3.2.0. Do not edit
// This file is generated by rust-protobuf 3.3.0. Do not edit
// @generated

// https://github.com/rust-lang/rust-clippy/issues/702
Expand All @@ -22,10 +22,10 @@

/// Generated files are compatible only with the same version
/// of protobuf runtime.
const _PROTOBUF_VERSION_CHECK: () = ::protobufv3::VERSION_3_2_0;
const _PROTOBUF_VERSION_CHECK: () = ::protobufv3::VERSION_3_3_0;

#[derive(PartialEq,Clone,Default,Debug)]
// @@protoc_insertion_point(message:helloworld.HelloRequest)
#[derive(PartialEq,Clone,Default,Debug)]
pub struct HelloRequest {
// message fields
// @@protoc_insertion_point(field:helloworld.HelloRequest.name)
Expand Down Expand Up @@ -146,8 +146,8 @@ impl ::protobufv3::reflect::ProtobufValue for HelloRequest {
type RuntimeType = ::protobufv3::reflect::rt::RuntimeTypeMessage<Self>;
}

#[derive(PartialEq,Clone,Default,Debug)]
// @@protoc_insertion_point(message:helloworld.HelloReply)
#[derive(PartialEq,Clone,Default,Debug)]
pub struct HelloReply {
// message fields
// @@protoc_insertion_point(field:helloworld.HelloReply.message)
Expand Down
14 changes: 7 additions & 7 deletions proto/src/proto/protobuf_v3/example/route_guide.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// This file is generated by rust-protobuf 3.2.0. Do not edit
// This file is generated by rust-protobuf 3.3.0. Do not edit
// @generated

// https://github.com/rust-lang/rust-clippy/issues/702
Expand All @@ -22,10 +22,10 @@

/// Generated files are compatible only with the same version
/// of protobuf runtime.
const _PROTOBUF_VERSION_CHECK: () = ::protobufv3::VERSION_3_2_0;
const _PROTOBUF_VERSION_CHECK: () = ::protobufv3::VERSION_3_3_0;

#[derive(PartialEq,Clone,Default,Debug)]
// @@protoc_insertion_point(message:routeguide.Point)
#[derive(PartialEq,Clone,Default,Debug)]
pub struct Point {
// message fields
// @@protoc_insertion_point(field:routeguide.Point.latitude)
Expand Down Expand Up @@ -164,8 +164,8 @@ impl ::protobufv3::reflect::ProtobufValue for Point {
type RuntimeType = ::protobufv3::reflect::rt::RuntimeTypeMessage<Self>;
}

#[derive(PartialEq,Clone,Default,Debug)]
// @@protoc_insertion_point(message:routeguide.Rectangle)
#[derive(PartialEq,Clone,Default,Debug)]
pub struct Rectangle {
// message fields
// @@protoc_insertion_point(field:routeguide.Rectangle.lo)
Expand Down Expand Up @@ -306,8 +306,8 @@ impl ::protobufv3::reflect::ProtobufValue for Rectangle {
type RuntimeType = ::protobufv3::reflect::rt::RuntimeTypeMessage<Self>;
}

#[derive(PartialEq,Clone,Default,Debug)]
// @@protoc_insertion_point(message:routeguide.Feature)
#[derive(PartialEq,Clone,Default,Debug)]
pub struct Feature {
// message fields
// @@protoc_insertion_point(field:routeguide.Feature.name)
Expand Down Expand Up @@ -447,8 +447,8 @@ impl ::protobufv3::reflect::ProtobufValue for Feature {
type RuntimeType = ::protobufv3::reflect::rt::RuntimeTypeMessage<Self>;
}

#[derive(PartialEq,Clone,Default,Debug)]
// @@protoc_insertion_point(message:routeguide.RouteNote)
#[derive(PartialEq,Clone,Default,Debug)]
pub struct RouteNote {
// message fields
// @@protoc_insertion_point(field:routeguide.RouteNote.location)
Expand Down Expand Up @@ -588,8 +588,8 @@ impl ::protobufv3::reflect::ProtobufValue for RouteNote {
type RuntimeType = ::protobufv3::reflect::rt::RuntimeTypeMessage<Self>;
}

#[derive(PartialEq,Clone,Default,Debug)]
// @@protoc_insertion_point(message:routeguide.RouteSummary)
#[derive(PartialEq,Clone,Default,Debug)]
pub struct RouteSummary {
// message fields
// @@protoc_insertion_point(field:routeguide.RouteSummary.point_count)
Expand Down
6 changes: 3 additions & 3 deletions proto/src/proto/protobuf_v3/google/rpc/status.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// This file is generated by rust-protobuf 3.2.0. Do not edit
// This file is generated by rust-protobuf 3.3.0. Do not edit
// @generated

// https://github.com/rust-lang/rust-clippy/issues/702
Expand All @@ -22,10 +22,10 @@

/// Generated files are compatible only with the same version
/// of protobuf runtime.
const _PROTOBUF_VERSION_CHECK: () = ::protobufv3::VERSION_3_2_0;
const _PROTOBUF_VERSION_CHECK: () = ::protobufv3::VERSION_3_3_0;

#[derive(PartialEq,Clone,Default,Debug)]
// @@protoc_insertion_point(message:google.rpc.Status)
#[derive(PartialEq,Clone,Default,Debug)]
pub struct Status {
// message fields
// @@protoc_insertion_point(field:google.rpc.Status.code)
Expand Down
Loading
Loading