From 1261557dc9753afe4bb9761abf6ef4abfddcc600 Mon Sep 17 00:00:00 2001 From: Thales <46510852+thalesfragoso@users.noreply.github.com> Date: Mon, 11 Oct 2021 15:56:15 -0300 Subject: [PATCH] protobuf: Update prost to 0.8 (Fixes CI on nightly) (#197) Co-authored-by: Rob Ede --- actix-protobuf/CHANGES.md | 3 +++ actix-protobuf/Cargo.toml | 4 ++-- actix-protobuf/examples/prost-example/Cargo.toml | 3 +-- actix-protobuf/examples/prost-example/src/main.rs | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/actix-protobuf/CHANGES.md b/actix-protobuf/CHANGES.md index 1a5c003a6..16b025a76 100644 --- a/actix-protobuf/CHANGES.md +++ b/actix-protobuf/CHANGES.md @@ -2,6 +2,9 @@ ## Unreleased - 2020-xx-xx * Minimum supported Rust version (MSRV) is now 1.51. +* Bump `prost` version to 0.8. [#197] + +[#197]: https://github.com/actix/actix-extras/pull/197 ## 0.7.0-beta.1 - 2020-06-27 diff --git a/actix-protobuf/Cargo.toml b/actix-protobuf/Cargo.toml index b99f5db16..1da072ae7 100644 --- a/actix-protobuf/Cargo.toml +++ b/actix-protobuf/Cargo.toml @@ -22,7 +22,7 @@ actix-rt = "2" actix-web = { version = "4.0.0-beta.8", default_features = false } derive_more = "0.99.5" futures-util = { version = "0.3.7", default-features = false } -prost = "0.7" +prost = { version = "0.8", default_features = false } [dev-dependencies] -prost-derive = "0.7" +prost = { version = "0.8", default_features = false, features = ["prost-derive"] } diff --git a/actix-protobuf/examples/prost-example/Cargo.toml b/actix-protobuf/examples/prost-example/Cargo.toml index 140345573..c1b8cdcdd 100644 --- a/actix-protobuf/examples/prost-example/Cargo.toml +++ b/actix-protobuf/examples/prost-example/Cargo.toml @@ -12,5 +12,4 @@ actix-web = "4.0.0-beta.8" actix-protobuf = { path = "../../" } env_logger = "0.8" -prost = "0.7" -prost-derive = "0.7" +prost = {version = "0.8", default_features = false, features = ["prost-derive"] } diff --git a/actix-protobuf/examples/prost-example/src/main.rs b/actix-protobuf/examples/prost-example/src/main.rs index 0e283384c..8dab194d7 100644 --- a/actix-protobuf/examples/prost-example/src/main.rs +++ b/actix-protobuf/examples/prost-example/src/main.rs @@ -1,6 +1,6 @@ use actix_protobuf::*; use actix_web::*; -use prost_derive::Message; +use prost::Message; #[derive(Clone, PartialEq, Message)] pub struct MyObj {