|
32 | 32 | use std::env; |
33 | 33 | use std::io; |
34 | 34 | use std::mem; |
| 35 | +use std::ptr; |
35 | 36 | use crate::Build; |
36 | 37 |
|
37 | 38 | type HANDLE = *mut u8; |
@@ -118,8 +119,8 @@ pub unsafe fn setup(build: &mut Build) { |
118 | 119 | SetErrorMode(mode & !SEM_NOGPFAULTERRORBOX); |
119 | 120 |
|
120 | 121 | // Create a new job object for us to use |
121 | | - let job = CreateJobObjectW(0 as *mut _, 0 as *const _); |
122 | | - assert!(job != 0 as *mut _, "{}", io::Error::last_os_error()); |
| 122 | + let job = CreateJobObjectW(ptr::null_mut(), ptr::null()); |
| 123 | + assert!(!job.is_null(), "{}", io::Error::last_os_error()); |
123 | 124 |
|
124 | 125 | // Indicate that when all handles to the job object are gone that all |
125 | 126 | // process in the object should be killed. Note that this includes our |
@@ -166,8 +167,8 @@ pub unsafe fn setup(build: &mut Build) { |
166 | 167 | }; |
167 | 168 |
|
168 | 169 | let parent = OpenProcess(PROCESS_DUP_HANDLE, FALSE, pid.parse().unwrap()); |
169 | | - assert!(parent != 0 as *mut _, "{}", io::Error::last_os_error()); |
170 | | - let mut parent_handle = 0 as *mut _; |
| 170 | + assert!(!parent.is_null(), "{}", io::Error::last_os_error()); |
| 171 | + let mut parent_handle = ptr::null_mut(); |
171 | 172 | let r = DuplicateHandle(GetCurrentProcess(), job, |
172 | 173 | parent, &mut parent_handle, |
173 | 174 | 0, FALSE, DUPLICATE_SAME_ACCESS); |
|
0 commit comments