From 8beaeb53d7e94ed523d7689128fd4f9012a3c9c2 Mon Sep 17 00:00:00 2001 From: kjuulh Date: Sun, 24 Sep 2023 22:09:36 +0200 Subject: [PATCH] feat: update deps Signed-off-by: kjuulh --- Cargo.lock | 2 +- crates/crunch-envelope/Cargo.toml | 2 +- .../src/generated/crunch.envelope.rs | 22 ++++++++++--------- crates/crunch/examples/nats.rs | 2 +- examples/basic-setup/Cargo.toml | 2 +- .../gencrunch/basic.includes.my_include.rs | 5 +++-- .../src/gencrunch/basic.my_event.rs | 9 ++++---- 7 files changed, 24 insertions(+), 20 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 51f6a73..3461dde 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -596,7 +596,7 @@ dependencies = [ "anyhow", "async-trait", "futures", - "prost 0.12.1", + "prost", "thiserror", "tokio", "uuid", diff --git a/crates/crunch-envelope/Cargo.toml b/crates/crunch-envelope/Cargo.toml index e2e3935..3f2d437 100644 --- a/crates/crunch-envelope/Cargo.toml +++ b/crates/crunch-envelope/Cargo.toml @@ -10,7 +10,7 @@ name = "envelope_benchmark" harness = false [features] -default = ["proto", "capnp"] +default = ["proto"] json = ["dep:serde", "dep:serde_json", "dep:base64"] proto = ["dep:prost", "dep:prost-types", "dep:bytes"] capnp = ["dep:capnp"] diff --git a/crates/crunch-envelope/src/generated/crunch.envelope.rs b/crates/crunch-envelope/src/generated/crunch.envelope.rs index ac4fe3b..f1fac0d 100644 --- a/crates/crunch-envelope/src/generated/crunch.envelope.rs +++ b/crates/crunch-envelope/src/generated/crunch.envelope.rs @@ -1,18 +1,20 @@ +#[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct Envelope { - #[prost(message, optional, tag="1")] - pub metadata: ::std::option::Option, - #[prost(bytes, tag="2")] - pub content: std::vec::Vec, + #[prost(message, optional, tag = "1")] + pub metadata: ::core::option::Option, + #[prost(bytes = "vec", tag = "2")] + pub content: ::prost::alloc::vec::Vec, } +#[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct Metadata { - #[prost(string, tag="1")] - pub domain: std::string::String, - #[prost(string, tag="2")] - pub entity: std::string::String, - #[prost(uint64, tag="3")] + #[prost(string, tag = "1")] + pub domain: ::prost::alloc::string::String, + #[prost(string, tag = "2")] + pub entity: ::prost::alloc::string::String, + #[prost(uint64, tag = "3")] pub timestamp: u64, - #[prost(uint64, tag="4")] + #[prost(uint64, tag = "4")] pub sequence: u64, } diff --git a/crates/crunch/examples/nats.rs b/crates/crunch/examples/nats.rs index be62370..919d58a 100644 --- a/crates/crunch/examples/nats.rs +++ b/crates/crunch/examples/nats.rs @@ -39,7 +39,7 @@ async fn main() -> anyhow::Result<()> { tracing_subscriber::fmt::init(); // Remember to start nats via. docker first, or set equivalent settings as in `NatsConnectOptions` - let crunch = crunch::builder::Builder::default() + let crunch = crunch::Builder::default() .with_nats_transport(NatsConnectOptions { host: "127.0.0.1:4222", credentials: NatsConnectCredentials::UserPass { diff --git a/examples/basic-setup/Cargo.toml b/examples/basic-setup/Cargo.toml index e913963..43b9641 100644 --- a/examples/basic-setup/Cargo.toml +++ b/examples/basic-setup/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -crunch = { workspace = true,default-features = false, features = ["in-memory"] } +crunch = { workspace = true, features = ["in-memory"] } tracing.workspace = true tokio.workspace = true diff --git a/examples/basic-setup/src/gencrunch/basic.includes.my_include.rs b/examples/basic-setup/src/gencrunch/basic.includes.my_include.rs index e84a31b..88a53be 100644 --- a/examples/basic-setup/src/gencrunch/basic.includes.my_include.rs +++ b/examples/basic-setup/src/gencrunch/basic.includes.my_include.rs @@ -1,5 +1,6 @@ +#[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct MyInclude { - #[prost(string, tag="1")] - pub name: std::string::String, + #[prost(string, tag = "1")] + pub name: ::prost::alloc::string::String, } diff --git a/examples/basic-setup/src/gencrunch/basic.my_event.rs b/examples/basic-setup/src/gencrunch/basic.my_event.rs index 1f41d31..78398a9 100644 --- a/examples/basic-setup/src/gencrunch/basic.my_event.rs +++ b/examples/basic-setup/src/gencrunch/basic.my_event.rs @@ -1,7 +1,8 @@ +#[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct MyEvent { - #[prost(string, tag="1")] - pub name: std::string::String, - #[prost(message, optional, tag="2")] - pub include: ::std::option::Option, + #[prost(string, tag = "1")] + pub name: ::prost::alloc::string::String, + #[prost(message, optional, tag = "2")] + pub include: ::core::option::Option, }