From b573eb2bc061713bdde1df16e8a58b82b09956e2 Mon Sep 17 00:00:00 2001 From: Raminder Singh Date: Thu, 25 Jul 2024 19:09:30 +0530 Subject: [PATCH] bump prost version to 0.13.1 and fix compiler errors due to that --- Cargo.toml | 4 ++-- pg_replicate/src/clients/bigquery.rs | 8 +++----- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index d99d083..cb9ca24 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,7 +2,7 @@ resolver = "2" -members = [ "api","pg_replicate", "queue", "replicator"] +members = ["api", "pg_replicate", "queue", "replicator"] [workspace.dependencies] async-trait = { version = "0.1" } @@ -15,7 +15,7 @@ futures = { version = "0.3", default-features = false } gcp-bigquery-client = { git = "https://github.com/imor/gcp-bigquery-client.git", branch = "result_set", default-features = false } pin-project-lite = { version = "0.2", default-features = false } postgres-protocol = { git = "https://github.com/MaterializeInc/rust-postgres" } -prost = { version = "0.12.6", default-features = false } +prost = { version = "0.13.1", default-features = false } secrecy = { version = "0.8.0", default-features = false } serde = { version = "1.0", default-features = false } serde_json = { version = "1.0", default-features = false } diff --git a/pg_replicate/src/clients/bigquery.rs b/pg_replicate/src/clients/bigquery.rs index a0cb9d7..ed2c3a7 100644 --- a/pg_replicate/src/clients/bigquery.rs +++ b/pg_replicate/src/clients/bigquery.rs @@ -527,9 +527,8 @@ impl BigQueryClient { } impl Message for TableRow { - fn encode_raw(&self, buf: &mut B) + fn encode_raw(&self, buf: &mut impl BufMut) where - B: BufMut, Self: Sized, { let mut tag = 1; @@ -577,15 +576,14 @@ impl Message for TableRow { } } - fn merge_field( + fn merge_field( &mut self, _tag: u32, _wire_type: prost::encoding::WireType, - _buf: &mut B, + _buf: &mut impl Buf, _ctx: prost::encoding::DecodeContext, ) -> Result<(), prost::DecodeError> where - B: Buf, Self: Sized, { unimplemented!("merge_field not implemented yet");