From e55caaa39731ec309680a38d228c3d807cea7cc9 Mon Sep 17 00:00:00 2001 From: Spencer Judge Date: Mon, 20 Nov 2023 15:21:08 -0800 Subject: [PATCH] Update Rust / lints --- .buildkite/docker/Dockerfile | 2 +- core/src/worker/workflow/managed_run.rs | 2 +- sdk-core-protos/src/lib.rs | 6 +++++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.buildkite/docker/Dockerfile b/.buildkite/docker/Dockerfile index 1078ce2f0..42966906a 100644 --- a/.buildkite/docker/Dockerfile +++ b/.buildkite/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM rust:1.71 +FROM rust:1.74 RUN rustup component add rustfmt && \ rustup component add clippy diff --git a/core/src/worker/workflow/managed_run.rs b/core/src/worker/workflow/managed_run.rs index 2fba859ee..2737d718c 100644 --- a/core/src/worker/workflow/managed_run.rs +++ b/core/src/worker/workflow/managed_run.rs @@ -732,7 +732,7 @@ impl ManagedRun { } else { None }; - self.update_to_acts(Ok(maybe_act).map(Into::into)) + self.update_to_acts(Ok(maybe_act.into())) } /// Returns `true` if autocompletion should be issued, which will actually cause us to end up /// in [completion] again, at which point we'll start a new heartbeat timeout, which will diff --git a/sdk-core-protos/src/lib.rs b/sdk-core-protos/src/lib.rs index a0caccf46..8d2e4d0f7 100644 --- a/sdk-core-protos/src/lib.rs +++ b/sdk-core-protos/src/lib.rs @@ -24,7 +24,11 @@ pub static ENCODING_PAYLOAD_KEY: &str = "encoding"; pub static JSON_ENCODING_VAL: &str = "json/plain"; pub static PATCHED_MARKER_DETAILS_KEY: &str = "patch-data"; -#[allow(clippy::large_enum_variant, clippy::derive_partial_eq_without_eq)] +#[allow( + clippy::large_enum_variant, + clippy::derive_partial_eq_without_eq, + clippy::reserve_after_initialization +)] // I'd prefer not to do this, but there are some generated things that just don't need it. #[allow(missing_docs)] pub mod coresdk {