Upgrade to 2024 edition

Author: Sushisource

.github/workflows/per-pr.yml

@@ -21,7 +21,7 @@ jobs:
           submodules: recursive
       - uses: dtolnay/rust-toolchain@stable
         with:
-          toolchain: 1.84.0
+          toolchain: 1.85.0
       - name: Install protoc
         uses: arduino/setup-protoc@v3
         with:
@@ -56,7 +56,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@stable
         with:
-          toolchain: 1.84.0
+          toolchain: 1.85.0
       - name: Install protoc
         uses: arduino/setup-protoc@v3
         with:
@@ -100,7 +100,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@stable
         with:
-          toolchain: 1.84.0
+          toolchain: 1.85.0
       - name: Install protoc
         uses: arduino/setup-protoc@v3
         with:
@@ -125,7 +125,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@stable
         with:
-          toolchain: 1.84.0
+          toolchain: 1.85.0
       - name: Install protoc
         uses: arduino/setup-protoc@v3
         with:

client/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "temporal-client"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 authors = ["Spencer Judge <[email protected]>"]
 license-file = { workspace = true }
 description = "Clients for interacting with Temporal Clusters"

core-api/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "temporal-sdk-core-api"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 authors = ["Spencer Judge <[email protected]>"]
 license-file = { workspace = true }
 description = "Interface definitions for the Temporal Core SDK"

core/Cargo.toml

@@ -2,7 +2,7 @@
 name = "temporal-sdk-core"
 version = "0.1.0"
 authors = ["Spencer Judge <[email protected]>", "Vitaly Arbuzov <[email protected]>"]
-edition = "2021"
+edition = "2024"
 license-file = { workspace = true }
 description = "Library for building new Temporal SDKs"
 homepage = "https://temporal.io/"

core/src/core_tests/queries.rs

@@ -1,9 +1,9 @@
 use crate::{
     test_help::{
-        build_mock_pollers, canned_histories, hist_to_poll_resp, mock_worker, single_hist_mock_sg,
-        MockPollCfg, MocksHolder, ResponseType, WorkerExt,
+        MockPollCfg, MocksHolder, ResponseType, WorkerExt, build_mock_pollers, canned_histories,
+        hist_to_poll_resp, mock_worker, single_hist_mock_sg,
     },
-    worker::{client::mocks::mock_workflow_client, LEGACY_QUERY_ID},
+    worker::{LEGACY_QUERY_ID, client::mocks::mock_workflow_client},
 };
 use futures_util::stream;
 use std::{
@@ -12,30 +12,30 @@ use std::{
 };
 use temporal_sdk_core_api::Worker as WorkerTrait;
 use temporal_sdk_core_protos::{
+    TestHistoryBuilder,
     coresdk::{
         workflow_activation::{
-            remove_from_cache::EvictionReason, workflow_activation_job, WorkflowActivationJob,
+            WorkflowActivationJob, remove_from_cache::EvictionReason, workflow_activation_job,
         },
         workflow_commands::{
-            query_result, ActivityCancellationType, CompleteWorkflowExecution,
-            ContinueAsNewWorkflowExecution, QueryResult, RequestCancelActivity,
+            ActivityCancellationType, CompleteWorkflowExecution, ContinueAsNewWorkflowExecution,
+            QueryResult, RequestCancelActivity, query_result,
         },
         workflow_completion::WorkflowActivationCompletion,
     },
     temporal::api::{
         common::v1::Payload,
         enums::v1::{CommandType, EventType},
         failure::v1::Failure,
-        history::v1::{history_event, ActivityTaskCancelRequestedEventAttributes, History},
+        history::v1::{ActivityTaskCancelRequestedEventAttributes, History, history_event},
         query::v1::WorkflowQuery,
         workflowservice::v1::{
             GetWorkflowExecutionHistoryResponse, RespondWorkflowTaskCompletedResponse,
         },
     },
-    TestHistoryBuilder,
 };
 use temporal_sdk_core_test_utils::{
-    query_ok, schedule_activity_cmd, start_timer_cmd, WorkerTestHelpers,
+    WorkerTestHelpers, query_ok, schedule_activity_cmd, start_timer_cmd,
 };
 
 #[rstest::rstest]
@@ -826,7 +826,7 @@ async fn legacy_query_combined_with_timer_fire_repro() {
     assert_matches!(
         task.jobs.as_slice(),
         [WorkflowActivationJob {
-            variant: Some(workflow_activation_job::Variant::QueryWorkflow(ref q)),
+            variant: Some(workflow_activation_job::Variant::QueryWorkflow(q)),
         }]
         if q.query_id == "the-query"
     );
@@ -844,7 +844,7 @@ async fn legacy_query_combined_with_timer_fire_repro() {
     assert_matches!(
         task.jobs.as_slice(),
         [WorkflowActivationJob {
-            variant: Some(workflow_activation_job::Variant::QueryWorkflow(ref q)),
+            variant: Some(workflow_activation_job::Variant::QueryWorkflow(q)),
         }]
         if q.query_id == LEGACY_QUERY_ID
     );

core/src/replay/mod.rs

@@ -3,21 +3,23 @@
 //! users during testing.
 
 use crate::{
+    Worker,
     worker::{
-        client::mocks::{mock_manual_workflow_client, MockManualWorkerClient},
         PostActivateHookData,
+        client::mocks::{MockManualWorkerClient, mock_manual_workflow_client},
     },
-    Worker,
 };
 use futures_util::{FutureExt, Stream, StreamExt};
 use parking_lot::Mutex;
-use std::sync::OnceLock;
 use std::{
     pin::Pin,
-    sync::Arc,
+    sync::{Arc, OnceLock},
     task::{Context, Poll},
 };
 use temporal_sdk_core_api::worker::WorkerConfig;
+pub use temporal_sdk_core_protos::{
+    DEFAULT_WORKFLOW_TYPE, HistoryInfo, TestHistoryBuilder, default_wes_attribs,
+};
 use temporal_sdk_core_protos::{
     coresdk::workflow_activation::remove_from_cache::EvictionReason,
     temporal::api::{
@@ -28,10 +30,7 @@ use temporal_sdk_core_protos::{
         },
     },
 };
-pub use temporal_sdk_core_protos::{
-    default_wes_attribs, HistoryInfo, TestHistoryBuilder, DEFAULT_WORKFLOW_TYPE,
-};
-use tokio::sync::{mpsc, mpsc::UnboundedSender, Mutex as TokioMutex};
+use tokio::sync::{Mutex as TokioMutex, mpsc, mpsc::UnboundedSender};
 use tokio_stream::wrappers::UnboundedReceiverStream;
 use tokio_util::sync::CancellationToken;
 
@@ -202,7 +201,7 @@ impl Historator {
     /// we're ready to replay the next history, or whatever else.
     pub(crate) fn get_post_activate_hook(
         &self,
-    ) -> impl Fn(&Worker, PostActivateHookData) + Send + Sync {
+    ) -> impl Fn(&Worker, PostActivateHookData) + Send + Sync + use<> {
         let done_tx = self.replay_done_tx.clone();
         move |worker, data| {
             if !data.replaying {

core/src/worker/workflow/history_update.rs

@@ -5,7 +5,7 @@ use crate::{
         workflow::{CacheMissFetchReq, PermittedWFT, PreparedWFT},
     },
 };
-use futures_util::{future::BoxFuture, FutureExt, Stream, TryFutureExt};
+use futures_util::{FutureExt, Stream, TryFutureExt, future::BoxFuture};
 use itertools::Itertools;
 use std::{
     collections::VecDeque,
@@ -20,8 +20,7 @@ use std::{
 use temporal_sdk_core_protos::temporal::api::{
     enums::v1::EventType,
     history::v1::{
-        history_event, history_event::Attributes, History, HistoryEvent,
-        WorkflowTaskCompletedEventAttributes,
+        History, HistoryEvent, WorkflowTaskCompletedEventAttributes, history_event::Attributes,
     },
 };
 use tracing::Instrument;
@@ -651,9 +650,7 @@ impl HistoryUpdate {
             .iter()
             .skip_while(|e| e.event_id < from_id)
             .find_map(|e| match &e.attributes {
-                Some(history_event::Attributes::WorkflowTaskCompletedEventAttributes(ref a)) => {
-                    Some(a)
-                }
+                Some(Attributes::WorkflowTaskCompletedEventAttributes(a)) => Some(a),
                 _ => None,
             })
     }
@@ -794,19 +791,19 @@ mod tests {
     use super::*;
     use crate::{
         replay::{HistoryInfo, TestHistoryBuilder},
-        test_help::{canned_histories, hist_to_poll_resp, mock_sdk_cfg, MockPollCfg, ResponseType},
+        test_help::{MockPollCfg, ResponseType, canned_histories, hist_to_poll_resp, mock_sdk_cfg},
         worker::client::mocks::mock_workflow_client,
     };
     use futures_util::{StreamExt, TryStreamExt};
     use std::sync::atomic::{AtomicUsize, Ordering};
     use temporal_client::WorkflowOptions;
     use temporal_sdk::WfContext;
     use temporal_sdk_core_protos::{
+        DEFAULT_WORKFLOW_TYPE,
         temporal::api::{
             common::v1::WorkflowExecution, enums::v1::WorkflowTaskFailedCause,
             workflowservice::v1::GetWorkflowExecutionHistoryResponse,
         },
-        DEFAULT_WORKFLOW_TYPE,
     };
 
     impl From<HistoryInfo> for HistoryUpdate {

core/src/worker/workflow/machines/workflow_machines.rs

@@ -1,6 +1,7 @@
 mod local_acts;
 
 use super::{
+    Machines, NewMachineWithCommand, TemporalStateMachine,
     cancel_external_state_machine::new_external_cancel,
     cancel_workflow_state_machine::cancel_workflow,
     complete_workflow_state_machine::complete_workflow,
@@ -9,34 +10,32 @@ use super::{
     patch_state_machine::has_change, signal_external_state_machine::new_external_signal,
     timer_state_machine::new_timer, upsert_search_attributes_state_machine::upsert_search_attrs,
     workflow_machines::local_acts::LocalActivityData,
-    workflow_task_state_machine::WorkflowTaskMachine, Machines, NewMachineWithCommand,
-    TemporalStateMachine,
+    workflow_task_state_machine::WorkflowTaskMachine,
 };
 use crate::{
     abstractions::dbg_panic,
     internal_flags::{CoreInternalFlags, InternalFlags},
     protosext::{
-        protocol_messages::{IncomingProtocolMessage, IncomingProtocolMessageBody},
         CompleteLocalActivityData, HistoryEventExt, ValidScheduleLA,
+        protocol_messages::{IncomingProtocolMessage, IncomingProtocolMessageBody},
     },
-    telemetry::{metrics::MetricsContext, VecDisplayer},
+    telemetry::{VecDisplayer, metrics::MetricsContext},
     worker::{
+        ExecutingLAId, LocalActRequest, LocalActivityExecutionResult, LocalActivityResolution,
         workflow::{
+            CommandID, DrivenWorkflow, HistoryUpdate, InternalFlagsRef, LocalResolution,
+            OutgoingJob, RunBasics, WFCommand, WFCommandVariant, WFMachinesError,
+            WorkflowStartedInfo,
             history_update::NextWFT,
             machines::{
-                activity_state_machine::ActivityMachine,
+                HistEventData, activity_state_machine::ActivityMachine,
                 child_workflow_state_machine::ChildWorkflowMachine,
                 modify_workflow_properties_state_machine::modify_workflow_properties,
                 nexus_operation_state_machine::NexusOperationMachine,
                 patch_state_machine::VERSION_SEARCH_ATTR_KEY, update_state_machine::UpdateMachine,
                 upsert_search_attributes_state_machine::upsert_search_attrs_internal,
-                HistEventData,
             },
-            CommandID, DrivenWorkflow, HistoryUpdate, InternalFlagsRef, LocalResolution,
-            OutgoingJob, RunBasics, WFCommand, WFCommandVariant, WFMachinesError,
-            WorkflowStartedInfo,
         },
-        ExecutingLAId, LocalActRequest, LocalActivityExecutionResult, LocalActivityResolution,
     },
 };
 use anyhow::Context;
@@ -58,17 +57,17 @@ use temporal_sdk_core_protos::{
         common::{NamespacedWorkflowExecution, VersioningIntent},
         workflow_activation,
         workflow_activation::{
-            workflow_activation_job, NotifyHasPatch, UpdateRandomSeed, WorkflowActivation,
+            NotifyHasPatch, UpdateRandomSeed, WorkflowActivation, workflow_activation_job,
         },
         workflow_commands::ContinueAsNewWorkflowExecution,
     },
     temporal::api::{
         command::v1::{
-            command::Attributes as ProtoCmdAttrs, Command as ProtoCommand, CommandAttributesExt,
+            Command as ProtoCommand, CommandAttributesExt, command::Attributes as ProtoCmdAttrs,
         },
         enums::v1::EventType,
-        history::v1::{history_event, HistoryEvent},
-        protocol::v1::{message::SequencingId, Message as ProtocolMessage},
+        history::v1::{HistoryEvent, history_event},
+        protocol::v1::{Message as ProtocolMessage, message::SequencingId},
         sdk::v1::{UserMetadata, WorkflowTaskCompletedMetadata},
     },
 };
@@ -241,7 +240,7 @@ where
 macro_rules! cancel_machine {
     ($self:expr, $cmd_id:expr, $machine_variant:ident, $cancel_method:ident $(, $args:expr )* $(,)?) => {{
         let m_key = $self.get_machine_key($cmd_id)?;
-        let machine = if let Machines::$machine_variant(ref mut m) = $self.machine_mut(m_key) {
+        let machine = if let Machines::$machine_variant(m) = $self.machine_mut(m_key) {
             m
         } else {
             return Err(WFMachinesError::Nondeterminism(format!(
@@ -1190,8 +1189,8 @@ impl WorkflowMachines {
                     }
                     c => {
                         return Err(WFMachinesError::Fatal(format!(
-                        "A machine requested to create a new command of an unsupported type: {c:?}"
-                    )))
+                            "A machine requested to create a new command of an unsupported type: {c:?}"
+                        )));
                     }
                 },
                 MachineResponse::IssueFakeLocalActivityMarker(seq) => {
@@ -1213,7 +1212,9 @@ impl WorkflowMachines {
                             let more_responses = lam.try_resolve_with_dat(preres)?;
                             self.process_machine_responses(smk, more_responses)?;
                         } else {
-                            panic!("A non local-activity machine returned a request cancel LA response");
+                            panic!(
+                                "A non local-activity machine returned a request cancel LA response"
+                            );
                         }
                     }
                     // If it's in the request queue, just rip it out.
@@ -1231,7 +1232,9 @@ impl WorkflowMachines {
                             )?;
                             self.process_machine_responses(smk, more_responses)?;
                         } else {
-                            panic!("A non local-activity machine returned a request cancel LA response");
+                            panic!(
+                                "A non local-activity machine returned a request cancel LA response"
+                            );
                         }
                     } else {
                         // Finally, if we know about the LA at all, it's currently running, so