Rebase fixes

Author: Sushisource

client/src/lib.rs

@@ -71,7 +71,7 @@ use temporal_sdk_core_protos::{
     },
 };
 use tonic::{
-    Code, Status,
+    Code,
     body::BoxBody,
     client::GrpcService,
     codegen::InterceptedService,

client/src/retry.rs

@@ -1,6 +1,6 @@
 use crate::{
-    Client, IsWorkerTaskLongPoll, NamespacedClient, NoRetryOnMatching, Result,
-    RetryConfig, raw::IsUserLongPoll,
+    Client, IsWorkerTaskLongPoll, NamespacedClient, NoRetryOnMatching, Result, RetryConfig,
+    raw::IsUserLongPoll,
 };
 use backoff::{Clock, SystemClock, backoff::Backoff, exponential::ExponentialBackoff};
 use futures_retry::{ErrorHandler, FutureRetry, RetryPolicy};

core/src/abstractions.rs

@@ -6,8 +6,8 @@ use crate::MetricsContext;
 use std::{
     fmt::{Debug, Formatter},
     sync::{
-        atomic::{AtomicBool, AtomicUsize, Ordering},
         Arc, OnceLock,
+        atomic::{AtomicBool, AtomicUsize, Ordering},
     },
     time::Instant,
 };

core/src/core_tests/mod.rs

@@ -17,7 +17,7 @@ use crate::{
 };
 use futures_util::FutureExt;
 use std::{sync::LazyLock, time::Duration};
-use temporal_sdk_core_api::{worker::PollerBehavior, Worker as WorkerTrait};
+use temporal_sdk_core_api::{Worker as WorkerTrait, worker::PollerBehavior};
 use temporal_sdk_core_protos::coresdk::workflow_completion::WorkflowActivationCompletion;
 use tokio::{sync::Barrier, time::sleep};
 

core/src/core_tests/workers.rs

@@ -14,7 +14,7 @@ use crate::{
 };
 use futures_util::{stream, stream::StreamExt};
 use std::{cell::RefCell, time::Duration};
-use temporal_sdk_core_api::{worker::PollerBehavior, Worker};
+use temporal_sdk_core_api::{Worker, worker::PollerBehavior};
 use temporal_sdk_core_protos::{
     coresdk::{
         workflow_activation::workflow_activation_job,

core/src/pollers/poll_buffer.rs

@@ -3,7 +3,7 @@ use crate::{
     pollers::{self, Poller},
     worker::client::{PollActivityOptions, PollOptions, PollWorkflowOptions, WorkerClient},
 };
-use futures_util::{FutureExt, StreamExt, future::BoxFuture, stream::FuturesUnordered};
+use futures_util::{FutureExt, StreamExt, future::BoxFuture};
 use governor::{Quota, RateLimiter};
 use std::{
     cmp,
@@ -29,6 +29,7 @@ use tokio::{
     sync::{
         Mutex, broadcast,
         mpsc::{UnboundedReceiver, unbounded_channel},
+        watch,
     },
     task::JoinHandle,
 };
@@ -292,7 +293,7 @@ where
             .await
             .expect("Poll allow does not panic");
     }
-    async fn wait_until_allowed(&mut self) -> ActiveCounter<impl Fn(usize)> {
+    async fn wait_until_allowed(&mut self) -> ActiveCounter<impl Fn(usize) + use<F>> {
         self.active_rx
             .wait_for(|v| {
                 *v < self.report_handle.max

core/src/test_help/mod.rs

@@ -31,7 +31,7 @@ use std::{
     time::Duration,
 };
 use temporal_sdk::interceptors::FailOnNondeterminismInterceptor;
-use temporal_sdk_core_api::{errors::PollError, worker::PollerBehavior, Worker as WorkerTrait};
+use temporal_sdk_core_api::{Worker as WorkerTrait, errors::PollError, worker::PollerBehavior};
 use temporal_sdk_core_protos::{
     coresdk::{
         workflow_activation::{WorkflowActivation, workflow_activation_job},

core/src/worker/mod.rs

@@ -66,7 +66,7 @@ use temporal_sdk_core_protos::{
         ActivityTaskCompletion,
         activity_result::activity_execution_result,
         activity_task::ActivityTask,
-        nexus::{nexus_task_completion, NexusTask, NexusTaskCompletion},
+        nexus::{NexusTask, NexusTaskCompletion, nexus_task_completion},
         workflow_activation::{WorkflowActivation, remove_from_cache::EvictionReason},
         workflow_completion::WorkflowActivationCompletion,
     },

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

@@ -7,7 +7,7 @@ use dashmap::{DashMap, DashSet, mapref::entry::Entry};
 use std::{
     path::PathBuf,
     sync::{
-        Mutex,
+        LazyLock, Mutex,
         mpsc::{SyncSender, sync_channel},
     },
     thread::JoinHandle,

test-utils/src/lib.rs

@@ -42,8 +42,8 @@ use temporal_sdk_core_api::{
     errors::PollError,
     telemetry::{
         Logger, OtelCollectorOptionsBuilder, PrometheusExporterOptions,
-        PrometheusExporterOptionsBuilder, TelemetryOptions,
-        TelemetryOptionsBuilder, metrics::CoreMeter,
+        PrometheusExporterOptionsBuilder, TelemetryOptions, TelemetryOptionsBuilder,
+        metrics::CoreMeter,
     },
 };
 use temporal_sdk_core_protos::{