diff --git a/crashtracker-ffi/src/collector_windows/api.rs b/crashtracker-ffi/src/collector_windows/api.rs index 303b1c631..98980d7ec 100644 --- a/crashtracker-ffi/src/collector_windows/api.rs +++ b/crashtracker-ffi/src/collector_windows/api.rs @@ -251,7 +251,7 @@ pub unsafe extern "C" fn ddog_crasht_exception_event_callback( let pid = GetProcessId(exception_information.hProcess); let crash_tid = GetThreadId(exception_information.hThread); - let threads = list_threads(pid); + let threads = list_threads(pid).expect("Failed to list threads"); let modules = list_modules(exception_information.hProcess).unwrap_or_else(|_| Vec::new()); let wer_context = read_wer_context(exception_information.hProcess, context as usize)?; @@ -262,7 +262,7 @@ pub unsafe extern "C" fn ddog_crasht_exception_event_callback( let mut builder = CrashInfoBuilder::new(); - for thread in threads.unwrap() { + for thread in threads { let stack_result = walk_thread_stack(exception_information.hProcess, thread, &modules); let stack: StackTrace = stack_result.unwrap_or_else(|e| { diff --git a/sidecar/src/windows.rs b/sidecar/src/windows.rs index 1401a41d0..d30cff0c0 100644 --- a/sidecar/src/windows.rs +++ b/sidecar/src/windows.rs @@ -14,7 +14,7 @@ use futures::FutureExt; use lazy_static::lazy_static; use manual_future::ManualFuture; use spawn_worker::{write_crashtracking_trampoline, SpawnWorker, Stdio}; -use std::ffi::{CStr, CString}; +use std::ffi::CStr; use std::io::{self, Error}; use std::os::windows::io::{AsRawHandle, IntoRawHandle, OwnedHandle}; use std::ptr::null_mut; @@ -38,8 +38,6 @@ use winapi::{ winnt::{TokenUser, HANDLE, TOKEN_QUERY, TOKEN_USER}, }, }; -use windows::core::PCWSTR; -use windows::Win32::System::LibraryLoader::LoadLibraryW; #[no_mangle] pub extern "C" fn ddog_daemon_entry_point() {