Relax the version pins for the various prost crates

components/butterfly/Cargo.toml

@@ -18,8 +18,8 @@ env_logger = "*"
 habitat_core = { git = "https://github.com/habitat-sh/core.git" }
 log = "*"
 lazy_static = "*"
-prost = "0.3.2"
-prost-derive = "0.3.2"
+prost = "*"
+prost-derive = "*"
 rand = "*"
 serde = "*"
 serde_derive = "*"
@@ -36,8 +36,8 @@ habitat_butterfly_test = { path = "../butterfly-test" }
 [build-dependencies]
 heck = "*"
 pkg-config = "0.3"
-prost = "0.3.2"
-prost-build = "0.3.2"
+prost = "*"
+prost-build = "*"
 tempdir = "*"
 
 [features]

components/butterfly/build.rs

@@ -14,7 +14,7 @@ fn main() {
 
 fn generate_protocols() {
     let mut config = prost_build::Config::new();
-    config.type_attribute(".", "#[derive(Serialize, Deserialize, Hash)]");
+    config.type_attribute(".", "#[derive(Serialize, Deserialize)]");
     config
         .compile_protos(&protocol_files(), &protocol_includes())
         .expect("Error compiling protobuf definitions");

components/butterfly/src/generated/butterfly.common.rs

@@ -1,5 +1,5 @@
 #[derive(Clone, PartialEq, Message)]
-#[derive(Serialize, Deserialize, Hash)]
+#[derive(Serialize, Deserialize)]
 pub struct Wire {
     #[prost(bool, optional, tag="1", default="false")]
     pub encrypted: ::std::option::Option<bool>,

components/butterfly/src/generated/butterfly.newscast.rs

@@ -1,5 +1,5 @@
 #[derive(Clone, PartialEq, Message)]
-#[derive(Serialize, Deserialize, Hash)]
+#[derive(Serialize, Deserialize)]
 pub struct Election {
     #[prost(string, optional, tag="1")]
     pub member_id: ::std::option::Option<String>,
@@ -15,16 +15,16 @@ pub struct Election {
     pub votes: ::std::vec::Vec<String>,
 }
 pub mod election {
-    #[derive(Clone, Copy, Debug, PartialEq, Eq, Enumeration)]
-    #[derive(Serialize, Deserialize, Hash)]
+    #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, Enumeration)]
+    #[derive(Serialize, Deserialize)]
     pub enum Status {
         Running = 1,
         NoQuorum = 2,
         Finished = 3,
     }
 }
 #[derive(Clone, PartialEq, Message)]
-#[derive(Serialize, Deserialize, Hash)]
+#[derive(Serialize, Deserialize)]
 pub struct Service {
     #[prost(string, optional, tag="1")]
     pub member_id: ::std::option::Option<String>,
@@ -42,7 +42,7 @@ pub struct Service {
     pub sys: ::std::option::Option<SysInfo>,
 }
 #[derive(Clone, PartialEq, Message)]
-#[derive(Serialize, Deserialize, Hash)]
+#[derive(Serialize, Deserialize)]
 pub struct ServiceConfig {
     #[prost(string, optional, tag="1")]
     pub service_group: ::std::option::Option<String>,
@@ -54,7 +54,7 @@ pub struct ServiceConfig {
     pub config: ::std::option::Option<Vec<u8>>,
 }
 #[derive(Clone, PartialEq, Message)]
-#[derive(Serialize, Deserialize, Hash)]
+#[derive(Serialize, Deserialize)]
 pub struct ServiceFile {
     #[prost(string, optional, tag="1")]
     pub service_group: ::std::option::Option<String>,
@@ -68,7 +68,7 @@ pub struct ServiceFile {
     pub body: ::std::option::Option<Vec<u8>>,
 }
 #[derive(Clone, PartialEq, Message)]
-#[derive(Serialize, Deserialize, Hash)]
+#[derive(Serialize, Deserialize)]
 pub struct SysInfo {
     #[prost(string, optional, tag="1", default="127.0.0.1")]
     pub ip: ::std::option::Option<String>,
@@ -88,13 +88,13 @@ pub struct SysInfo {
     pub ctl_gateway_port: ::std::option::Option<u32>,
 }
 #[derive(Clone, PartialEq, Message)]
-#[derive(Serialize, Deserialize, Hash)]
+#[derive(Serialize, Deserialize)]
 pub struct Departure {
     #[prost(string, optional, tag="1")]
     pub member_id: ::std::option::Option<String>,
 }
 #[derive(Clone, PartialEq, Message)]
-#[derive(Serialize, Deserialize, Hash)]
+#[derive(Serialize, Deserialize)]
 pub struct Rumor {
     #[prost(enumeration="rumor::Type", required, tag="1")]
     pub type_: i32,
@@ -106,8 +106,8 @@ pub struct Rumor {
     pub payload: ::std::option::Option<rumor::Payload>,
 }
 pub mod rumor {
-    #[derive(Clone, Copy, Debug, PartialEq, Eq, Enumeration)]
-    #[derive(Serialize, Deserialize, Hash)]
+    #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, Enumeration)]
+    #[derive(Serialize, Deserialize)]
     pub enum Type {
         Member = 1,
         Service = 2,
@@ -120,7 +120,7 @@ pub mod rumor {
         Departure = 9,
     }
     #[derive(Clone, Oneof, PartialEq)]
-    #[derive(Serialize, Deserialize, Hash)]
+    #[derive(Serialize, Deserialize)]
     pub enum Payload {
         #[prost(message, tag="4")]
         Member(super::super::swim::Membership),

components/butterfly/src/generated/butterfly.swim.rs

@@ -1,5 +1,5 @@
 #[derive(Clone, PartialEq, Message)]
-#[derive(Serialize, Deserialize, Hash)]
+#[derive(Serialize, Deserialize)]
 pub struct Member {
     #[prost(string, optional, tag="1")]
     pub id: ::std::option::Option<String>,
@@ -17,40 +17,40 @@ pub struct Member {
     pub departed: ::std::option::Option<bool>,
 }
 #[derive(Clone, PartialEq, Message)]
-#[derive(Serialize, Deserialize, Hash)]
+#[derive(Serialize, Deserialize)]
 pub struct Ping {
     #[prost(message, optional, tag="1")]
     pub from: ::std::option::Option<Member>,
     #[prost(message, optional, tag="2")]
     pub forward_to: ::std::option::Option<Member>,
 }
 #[derive(Clone, PartialEq, Message)]
-#[derive(Serialize, Deserialize, Hash)]
+#[derive(Serialize, Deserialize)]
 pub struct Ack {
     #[prost(message, optional, tag="1")]
     pub from: ::std::option::Option<Member>,
     #[prost(message, optional, tag="2")]
     pub forward_to: ::std::option::Option<Member>,
 }
 #[derive(Clone, PartialEq, Message)]
-#[derive(Serialize, Deserialize, Hash)]
+#[derive(Serialize, Deserialize)]
 pub struct PingReq {
     #[prost(message, optional, tag="1")]
     pub from: ::std::option::Option<Member>,
     #[prost(message, optional, tag="2")]
     pub target: ::std::option::Option<Member>,
 }
 #[derive(Clone, PartialEq, Message)]
-#[derive(Serialize, Deserialize, Hash)]
+#[derive(Serialize, Deserialize)]
 pub struct Membership {
     #[prost(message, optional, tag="1")]
     pub member: ::std::option::Option<Member>,
     #[prost(enumeration="membership::Health", optional, tag="2")]
     pub health: ::std::option::Option<i32>,
 }
 pub mod membership {
-    #[derive(Clone, Copy, Debug, PartialEq, Eq, Enumeration)]
-    #[derive(Serialize, Deserialize, Hash)]
+    #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, Enumeration)]
+    #[derive(Serialize, Deserialize)]
     pub enum Health {
         Alive = 1,
         Suspect = 2,
@@ -59,7 +59,7 @@ pub mod membership {
     }
 }
 #[derive(Clone, PartialEq, Message)]
-#[derive(Serialize, Deserialize, Hash)]
+#[derive(Serialize, Deserialize)]
 pub struct Swim {
     /// Identifies which field is filled in.
     #[prost(enumeration="swim::Type", required, tag="1")]
@@ -70,15 +70,15 @@ pub struct Swim {
     pub payload: ::std::option::Option<swim::Payload>,
 }
 pub mod swim {
-    #[derive(Clone, Copy, Debug, PartialEq, Eq, Enumeration)]
-    #[derive(Serialize, Deserialize, Hash)]
+    #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, Enumeration)]
+    #[derive(Serialize, Deserialize)]
     pub enum Type {
         Ping = 1,
         Ack = 2,
         Pingreq = 3,
     }
     #[derive(Clone, Oneof, PartialEq)]
-    #[derive(Serialize, Deserialize, Hash)]
+    #[derive(Serialize, Deserialize)]
     pub enum Payload {
         #[prost(message, tag="2")]
         Ping(super::Ping),

components/sup-client/Cargo.toml

@@ -8,7 +8,7 @@ workspace = "../../"
 futures = "*"
 habitat-sup-protocol = { path = "../sup-protocol", default-features = false }
 log = "*"
-prost = "0.3.2"
+prost = "*"
 tokio = "*"
 tokio-core = "*"
 tokio-io = "*"

components/sup-protocol/Cargo.toml

@@ -12,8 +12,8 @@ futures = "*"
 habitat_core = { git = "https://github.com/habitat-sh/core.git" }
 lazy_static = "*"
 log = "*"
-prost = "0.3.2"
-prost-derive = "0.3.2"
+prost = "*"
+prost-derive = "*"
 rand = "*"
 serde = "*"
 serde_derive = "*"
@@ -22,9 +22,9 @@ tokio-io = "*"
 
 [build-dependencies]
 heck = "*"
-prost = "0.3.2"
-prost-build = "0.3.2"
-prost-types = "0.3.2"
+prost = "*"
+prost-build = "*"
+prost-types = "*"
 tempdir = "*"
 
 [dev-dependencies]

components/sup/Cargo.toml

@@ -47,7 +47,7 @@ libc = "*"
 log = "*"
 notify = "*"
 persistent = "*"
-prost = "0.3.2"
+prost = "*"
 protobuf = { version = "1.5.1", features = ["bytes"] }
 rand = "*"
 regex = "*"