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.

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

Update prost to v0.12.1 #4825

Merged
merged 1 commit into from
Sep 17, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 arrow-flight/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@ bytes = { version = "1", default-features = false }
futures = { version = "0.3", default-features = false, features = ["alloc"] }
once_cell = { version = "1", optional = true }
paste = { version = "1.0" }
prost = { version = "0.11", default-features = false, features = ["prost-derive"] }
prost = { version = "0.12.1", default-features = false, features = ["prost-derive"] }
tokio = { version = "1.0", default-features = false, features = ["macros", "rt", "rt-multi-thread"] }
tonic = { version = "0.9", default-features = false, features = ["transport", "codegen", "prost"] }
tonic = { version = "0.10.0", default-features = false, features = ["transport", "codegen", "prost"] }

# CLI-related dependencies
clap = { version = "4.1", default-features = false, features = ["std", "derive", "env", "help", "error-context", "usage"], optional = true }
Expand Down
4 changes: 2 additions & 2 deletions arrow-flight/gen/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,5 @@ publish = false
# Pin specific version of the tonic-build dependencies to avoid auto-generated
# (and checked in) arrow.flight.protocol.rs from changing
proc-macro2 = { version = "=1.0.67", default-features = false }
prost-build = { version = "=0.11.9", default-features = false }
tonic-build = { version = "=0.9.2", default-features = false, features = ["transport", "prost"] }
prost-build = { version = "=0.12.1", default-features = false }
tonic-build = { version = "=0.10.0", default-features = false, features = ["transport", "prost"] }
44 changes: 28 additions & 16 deletions arrow-flight/src/arrow.flight.protocol.rs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 0 additions & 10 deletions arrow-flight/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -316,16 +316,6 @@ impl TryFrom<SchemaAsIpc<'_>> for SchemaResult {
}
}

// TryFrom...

impl TryFrom<i32> for DescriptorType {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is now provided by the proc macro - tokio-rs/prost#853

type Error = ArrowError;

fn try_from(value: i32) -> ArrowResult<Self> {
value.try_into()
}
}

impl TryFrom<SchemaAsIpc<'_>> for IpcMessage {
type Error = ArrowError;

Expand Down
Loading
Loading