diff --git a/libs/crosstarget-utils/src/common.rs b/libs/crosstarget-utils/src/common.rs index 3afce64c6714..92a1d5094e89 100644 --- a/libs/crosstarget-utils/src/common.rs +++ b/libs/crosstarget-utils/src/common.rs @@ -1,13 +1,7 @@ use std::fmt::Display; #[derive(Debug)] -pub struct SpawnError {} - -impl SpawnError { - pub fn new() -> Self { - SpawnError {} - } -} +pub struct SpawnError; impl Display for SpawnError { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { @@ -18,13 +12,7 @@ impl Display for SpawnError { impl std::error::Error for SpawnError {} #[derive(Debug)] -pub struct TimeoutError {} - -impl TimeoutError { - pub fn new() -> Self { - TimeoutError {} - } -} +pub struct TimeoutError; impl Display for TimeoutError { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { diff --git a/libs/crosstarget-utils/src/native/spawn.rs b/libs/crosstarget-utils/src/native/spawn.rs index b0d541258c2a..8a8360c580fa 100644 --- a/libs/crosstarget-utils/src/native/spawn.rs +++ b/libs/crosstarget-utils/src/native/spawn.rs @@ -7,5 +7,5 @@ where F: Future + 'static + Send, F::Output: Send + 'static, { - tokio::spawn(future).await.map_err(|_| SpawnError::new()) + tokio::spawn(future).await.map_err(|_| SpawnError) } diff --git a/libs/crosstarget-utils/src/native/time.rs b/libs/crosstarget-utils/src/native/time.rs index e222e08cf628..3b154a27565c 100644 --- a/libs/crosstarget-utils/src/native/time.rs +++ b/libs/crosstarget-utils/src/native/time.rs @@ -21,7 +21,7 @@ impl ElapsedTimeCounter { } } -pub async fn sleep(duration: Duration) -> () { +pub async fn sleep(duration: Duration) { tokio::time::sleep(duration).await } @@ -31,5 +31,5 @@ where { let result = tokio::time::timeout(duration, future).await; - result.map_err(|_| TimeoutError::new()) + result.map_err(|_| TimeoutError) } diff --git a/libs/crosstarget-utils/src/wasm/time.rs b/libs/crosstarget-utils/src/wasm/time.rs index e983aa5678a6..6f14ac001ee8 100644 --- a/libs/crosstarget-utils/src/wasm/time.rs +++ b/libs/crosstarget-utils/src/wasm/time.rs @@ -50,7 +50,7 @@ where { tokio::select! { result = future => Ok(result), - _ = sleep(duration) => Err(TimeoutError::new()) + _ = sleep(duration) => Err(TimeoutError) } } diff --git a/query-engine/connector-test-kit-rs/query-tests-setup/src/connector_tag/js/external_process.rs b/query-engine/connector-test-kit-rs/query-tests-setup/src/connector_tag/js/external_process.rs index 6e7e9ae81b8a..912a5e6d8abf 100644 --- a/query-engine/connector-test-kit-rs/query-tests-setup/src/connector_tag/js/external_process.rs +++ b/query-engine/connector-test-kit-rs/query-tests-setup/src/connector_tag/js/external_process.rs @@ -140,7 +140,7 @@ impl Display for ExecutorProcessDiedError { impl StdError for ExecutorProcessDiedError {} -pub(super) static EXTERNAL_PROCESS: Lazy = Lazy::new(|| RestartableExecutorProcess::new()); +pub(super) static EXTERNAL_PROCESS: Lazy = Lazy::new(RestartableExecutorProcess::new); type ReqImpl = ( jsonrpc_core::MethodCall, @@ -215,7 +215,7 @@ fn start_rpc_thread(mut receiver: mpsc::Receiver) -> Result<()> { { tracing::error!("Error when reading from child node process. Process might have exited. Restarting..."); if let Some((_, sender)) = last_pending_request.take() { - let _ = sender.send(Err(Box::new(ExecutorProcessDiedError))).unwrap(); + sender.send(Err(Box::new(ExecutorProcessDiedError))).unwrap(); } EXTERNAL_PROCESS.restart().await; break;