File tree Expand file tree Collapse file tree 4 files changed +134
-123
lines changed Expand file tree Collapse file tree 4 files changed +134
-123
lines changed Original file line number Diff line number Diff line change @@ -240,7 +240,7 @@ impl Entry {
240
240
241
241
/// Returns the bare file name of this directory entry without any other leading path component.
242
242
pub fn file_name ( & self ) -> & ffi:: CStr {
243
- unsafe { :: std :: ffi:: CStr :: from_ptr ( self . 0 . d_name . as_ptr ( ) ) }
243
+ unsafe { ffi:: CStr :: from_ptr ( self . 0 . d_name . as_ptr ( ) ) }
244
244
}
245
245
246
246
/// Returns the type of this directory entry, if known.
Original file line number Diff line number Diff line change @@ -237,7 +237,7 @@ pub fn renameat<P1: ?Sized + NixPath, P2: ?Sized + NixPath>(
237
237
}
238
238
}
239
239
240
- #[ cfg( all( target_os = "linux" , target_env = "gnu" , ) ) ]
240
+ #[ cfg( all( target_os = "linux" , target_env = "gnu" ) ) ]
241
241
#[ cfg( feature = "fs" ) ]
242
242
libc_bitflags ! {
243
243
#[ cfg_attr( docsrs, doc( cfg( feature = "fs" ) ) ) ]
@@ -250,10 +250,7 @@ libc_bitflags! {
250
250
251
251
feature ! {
252
252
#![ feature = "fs" ]
253
- #[ cfg( all(
254
- target_os = "linux" ,
255
- target_env = "gnu" ,
256
- ) ) ]
253
+ #[ cfg( all( target_os = "linux" , target_env = "gnu" ) ) ]
257
254
pub fn renameat2<P1 : ?Sized + NixPath , P2 : ?Sized + NixPath >(
258
255
old_dirfd: Option <RawFd >,
259
256
old_path: & P1 ,
Original file line number Diff line number Diff line change @@ -2221,14 +2221,14 @@ pub fn recvfrom<T: SockaddrLike>(
2221
2221
buf. as_ptr ( ) as * mut c_void ,
2222
2222
buf. len ( ) as size_t ,
2223
2223
0 ,
2224
- addr. as_mut_ptr ( ) as * mut libc :: sockaddr ,
2224
+ addr. as_mut_ptr ( ) as * mut sockaddr ,
2225
2225
& mut len as * mut socklen_t ,
2226
2226
) ) ? as usize ;
2227
2227
2228
2228
Ok ( (
2229
2229
ret,
2230
2230
T :: from_raw (
2231
- addr. assume_init ( ) . as_ptr ( ) as * const libc :: sockaddr ,
2231
+ addr. assume_init ( ) . as_ptr ( ) as * const sockaddr ,
2232
2232
Some ( len) ,
2233
2233
) ,
2234
2234
) )
@@ -2336,11 +2336,8 @@ pub fn getpeername<T: SockaddrLike>(fd: RawFd) -> Result<T> {
2336
2336
let mut addr = mem:: MaybeUninit :: < T > :: uninit ( ) ;
2337
2337
let mut len = T :: size ( ) ;
2338
2338
2339
- let ret = libc:: getpeername (
2340
- fd,
2341
- addr. as_mut_ptr ( ) as * mut libc:: sockaddr ,
2342
- & mut len,
2343
- ) ;
2339
+ let ret =
2340
+ libc:: getpeername ( fd, addr. as_mut_ptr ( ) as * mut sockaddr , & mut len) ;
2344
2341
2345
2342
Errno :: result ( ret) ?;
2346
2343
@@ -2356,11 +2353,8 @@ pub fn getsockname<T: SockaddrLike>(fd: RawFd) -> Result<T> {
2356
2353
let mut addr = mem:: MaybeUninit :: < T > :: uninit ( ) ;
2357
2354
let mut len = T :: size ( ) ;
2358
2355
2359
- let ret = libc:: getsockname (
2360
- fd,
2361
- addr. as_mut_ptr ( ) as * mut libc:: sockaddr ,
2362
- & mut len,
2363
- ) ;
2356
+ let ret =
2357
+ libc:: getsockname ( fd, addr. as_mut_ptr ( ) as * mut sockaddr , & mut len) ;
2364
2358
2365
2359
Errno :: result ( ret) ?;
2366
2360
You can’t perform that action at this time.
0 commit comments