4
4
5
5
use super :: raw:: { AsRawHandle , FromRawHandle , IntoRawHandle , RawHandle } ;
6
6
use crate :: convert:: TryFrom ;
7
- use crate :: ffi:: c_void;
8
7
use crate :: fmt;
9
8
use crate :: fs;
10
9
use crate :: marker:: PhantomData ;
@@ -133,7 +132,7 @@ impl TryFrom<HandleOrNull> for OwnedHandle {
133
132
#[ inline]
134
133
fn try_from ( handle_or_null : HandleOrNull ) -> Result < Self , ( ) > {
135
134
let owned_handle = handle_or_null. 0 ;
136
- if owned_handle. handle . as_ptr ( ) . is_null ( ) { Err ( ( ) ) } else { Ok ( owned_handle) }
135
+ if owned_handle. handle . is_null ( ) { Err ( ( ) ) } else { Ok ( owned_handle) }
137
136
}
138
137
}
139
138
@@ -143,32 +142,28 @@ impl TryFrom<HandleOrInvalid> for OwnedHandle {
143
142
#[ inline]
144
143
fn try_from ( handle_or_invalid : HandleOrInvalid ) -> Result < Self , ( ) > {
145
144
let owned_handle = handle_or_invalid. 0 ;
146
- if owned_handle. handle . as_ptr ( ) == c:: INVALID_HANDLE_VALUE {
147
- Err ( ( ) )
148
- } else {
149
- Ok ( owned_handle)
150
- }
145
+ if owned_handle. handle == c:: INVALID_HANDLE_VALUE { Err ( ( ) ) } else { Ok ( owned_handle) }
151
146
}
152
147
}
153
148
154
149
impl AsRawHandle for BorrowedHandle < ' _ > {
155
150
#[ inline]
156
151
fn as_raw_handle ( & self ) -> RawHandle {
157
- self . handle . as_ptr ( )
152
+ self . handle
158
153
}
159
154
}
160
155
161
156
impl AsRawHandle for OwnedHandle {
162
157
#[ inline]
163
158
fn as_raw_handle ( & self ) -> RawHandle {
164
- self . handle . as_ptr ( )
159
+ self . handle
165
160
}
166
161
}
167
162
168
163
impl IntoRawHandle for OwnedHandle {
169
164
#[ inline]
170
165
fn into_raw_handle ( self ) -> RawHandle {
171
- let handle = self . handle . as_ptr ( ) ;
166
+ let handle = self . handle ;
172
167
forget ( self ) ;
173
168
handle
174
169
}
@@ -244,7 +239,7 @@ impl Drop for OwnedHandle {
244
239
#[ inline]
245
240
fn drop ( & mut self ) {
246
241
unsafe {
247
- let _ = c:: CloseHandle ( self . handle . as_ptr ( ) ) ;
242
+ let _ = c:: CloseHandle ( self . handle ) ;
248
243
}
249
244
}
250
245
}
0 commit comments