From 4378c2661ff2093cd755256830c79dd7de798625 Mon Sep 17 00:00:00 2001 From: Levi Morrison Date: Tue, 11 Feb 2025 10:25:11 -0700 Subject: [PATCH] fix(prof): combine thread timeout errors properly (#3081) --- profiling/src/profiling/mod.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/profiling/src/profiling/mod.rs b/profiling/src/profiling/mod.rs index e2ba644f2f..37e6e8bee7 100644 --- a/profiling/src/profiling/mod.rs +++ b/profiling/src/profiling/mod.rs @@ -719,7 +719,7 @@ impl Profiler { } let num_failures = result1.is_err() as usize + result2.is_err() as usize; - result2.or(result1).map_err(|_| JoinError { num_failures }) + result2.and(result1).map_err(|_| JoinError { num_failures }) } else { Ok(()) }