From f5fee0a1a4ab8de7110edb99f59e0c2e2b89efb6 Mon Sep 17 00:00:00 2001 From: Timothy Clem Date: Thu, 18 Jul 2024 14:08:31 -0700 Subject: [PATCH 1/2] Update prost and prost-wkt --- Cargo.lock | 92 ++++++++--------------------------------- crates/twirp/Cargo.toml | 2 +- example/Cargo.toml | 8 ++-- 3 files changed, 23 insertions(+), 79 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1a34837..046902b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -202,8 +202,8 @@ version = "0.1.0" dependencies = [ "fs-err", "glob", - "prost 0.12.6", - "prost-build 0.13.1", + "prost", + "prost-build", "prost-wkt", "prost-wkt-build", "prost-wkt-types", @@ -673,16 +673,6 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "prost" -version = "0.12.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29" -dependencies = [ - "bytes", - "prost-derive 0.12.6", -] - [[package]] name = "prost" version = "0.13.1" @@ -690,28 +680,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e13db3d3fde688c61e2446b4d843bc27a7e8af269a69440c0308021dc92333cc" dependencies = [ "bytes", - "prost-derive 0.13.1", -] - -[[package]] -name = "prost-build" -version = "0.12.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22505a5c94da8e3b7c2996394d1c933236c4d743e81a410bcca4e6989fc066a4" -dependencies = [ - "bytes", - "heck", - "itertools", - "log", - "multimap", - "once_cell", - "petgraph", - "prettyplease", - "prost 0.12.6", - "prost-types 0.12.6", - "regex", - "syn", - "tempfile", + "prost-derive", ] [[package]] @@ -728,26 +697,13 @@ dependencies = [ "once_cell", "petgraph", "prettyplease", - "prost 0.13.1", - "prost-types 0.13.1", + "prost", + "prost-types", "regex", "syn", "tempfile", ] -[[package]] -name = "prost-derive" -version = "0.12.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1" -dependencies = [ - "anyhow", - "itertools", - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "prost-derive" version = "0.13.1" @@ -761,33 +717,23 @@ dependencies = [ "syn", ] -[[package]] -name = "prost-types" -version = "0.12.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9091c90b0a32608e984ff2fa4091273cbdd755d54935c51d520887f4a1dbd5b0" -dependencies = [ - "prost 0.12.6", -] - [[package]] name = "prost-types" version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cee5168b05f49d4b0ca581206eb14a7b22fafd963efe729ac48eb03266e25cc2" dependencies = [ - "prost 0.13.1", + "prost", ] [[package]] name = "prost-wkt" version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fb7ec2850c138ebaa7ab682503b5d08c3cb330343e9c94776612928b6ddb53f" +source = "git+https://github.com/fdeantoni/prost-wkt.git?rev=0d06c21b24f195fb2bf6e8558111eae9c552f466#0d06c21b24f195fb2bf6e8558111eae9c552f466" dependencies = [ "chrono", "inventory", - "prost 0.12.6", + "prost", "serde", "serde_derive", "serde_json", @@ -797,26 +743,24 @@ dependencies = [ [[package]] name = "prost-wkt-build" version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "598b7365952c2ed4e32902de0533653aafbe5ae3da436e8e2335c7d375a1cef3" +source = "git+https://github.com/fdeantoni/prost-wkt.git?rev=0d06c21b24f195fb2bf6e8558111eae9c552f466#0d06c21b24f195fb2bf6e8558111eae9c552f466" dependencies = [ "heck", - "prost 0.12.6", - "prost-build 0.12.6", - "prost-types 0.12.6", + "prost", + "prost-build", + "prost-types", "quote", ] [[package]] name = "prost-wkt-types" version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a8eadc2381640a49c1fbfb9f4a857794b4e5bf5a2cbc2d858cfdb74f64dcd22" +source = "git+https://github.com/fdeantoni/prost-wkt.git?rev=0d06c21b24f195fb2bf6e8558111eae9c552f466#0d06c21b24f195fb2bf6e8558111eae9c552f466" dependencies = [ "chrono", - "prost 0.12.6", - "prost-build 0.12.6", - "prost-types 0.12.6", + "prost", + "prost-build", + "prost-types", "prost-wkt", "prost-wkt-build", "regex", @@ -1169,7 +1113,7 @@ dependencies = [ "http", "http-body-util", "hyper", - "prost 0.12.6", + "prost", "reqwest", "serde", "serde_json", @@ -1183,7 +1127,7 @@ dependencies = [ name = "twirp-build" version = "0.3.0" dependencies = [ - "prost-build 0.13.1", + "prost-build", ] [[package]] diff --git a/crates/twirp/Cargo.toml b/crates/twirp/Cargo.toml index 56dbe6c..8be00d7 100644 --- a/crates/twirp/Cargo.toml +++ b/crates/twirp/Cargo.toml @@ -20,7 +20,7 @@ futures = "0.3" http = "1.0" http-body-util = "0.1" hyper = { version = "1.4", default-features = false } -prost = "0.12" +prost = "0.13" reqwest = { version = "0.12", default-features = false } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" diff --git a/example/Cargo.toml b/example/Cargo.toml index 8feaaf4..29923ba 100644 --- a/example/Cargo.toml +++ b/example/Cargo.toml @@ -6,9 +6,9 @@ edition = "2021" [dependencies] twirp = { path = "../crates/twirp" } -prost = "0.12" -prost-wkt = "0.5" -prost-wkt-types = "0.5" +prost = "0.13" +prost-wkt = { git = "https://github.com/fdeantoni/prost-wkt.git", rev = "0d06c21b24f195fb2bf6e8558111eae9c552f466" } +prost-wkt-types = { git = "https://github.com/fdeantoni/prost-wkt.git", rev = "0d06c21b24f195fb2bf6e8558111eae9c552f466" } serde = { version = "1.0", features = ["derive"] } tokio = { version = "1.38", features = ["rt-multi-thread", "macros"] } @@ -18,7 +18,7 @@ twirp-build = { path = "../crates/twirp-build" } fs-err = "2.8" glob = "0.3.0" prost-build = "0.13" -prost-wkt-build = "0.5" +prost-wkt-build = { git = "https://github.com/fdeantoni/prost-wkt.git", rev = "0d06c21b24f195fb2bf6e8558111eae9c552f466" } [[bin]] name = "example-client" From c4988bd70ac7b651e3d922ce4ab2af819285189a Mon Sep 17 00:00:00 2001 From: Timothy Clem Date: Thu, 18 Jul 2024 14:09:41 -0700 Subject: [PATCH 2/2] Leave a note --- example/Cargo.toml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/example/Cargo.toml b/example/Cargo.toml index 29923ba..fa7a926 100644 --- a/example/Cargo.toml +++ b/example/Cargo.toml @@ -7,6 +7,7 @@ edition = "2021" twirp = { path = "../crates/twirp" } prost = "0.13" +# TODO: Go back to a true release, waiting on https://github.com/fdeantoni/prost-wkt/pull/68 prost-wkt = { git = "https://github.com/fdeantoni/prost-wkt.git", rev = "0d06c21b24f195fb2bf6e8558111eae9c552f466" } prost-wkt-types = { git = "https://github.com/fdeantoni/prost-wkt.git", rev = "0d06c21b24f195fb2bf6e8558111eae9c552f466" } serde = { version = "1.0", features = ["derive"] } @@ -18,6 +19,7 @@ twirp-build = { path = "../crates/twirp-build" } fs-err = "2.8" glob = "0.3.0" prost-build = "0.13" +# TODO: Go back to a true release, waiting on https://github.com/fdeantoni/prost-wkt/pull/68 prost-wkt-build = { git = "https://github.com/fdeantoni/prost-wkt.git", rev = "0d06c21b24f195fb2bf6e8558111eae9c552f466" } [[bin]] pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy