Skip to content

Commit 6ba8274

Browse files
committed
Move some pure formatting changes out of nix-rust#1863
Signed-off-by: Alex Saveau <[email protected]>
1 parent bedf83b commit 6ba8274

File tree

4 files changed

+134
-123
lines changed

4 files changed

+134
-123
lines changed

src/dir.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ impl Entry {
240240

241241
/// Returns the bare file name of this directory entry without any other leading path component.
242242
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()) }
244244
}
245245

246246
/// Returns the type of this directory entry, if known.

src/fcntl.rs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ pub fn renameat<P1: ?Sized + NixPath, P2: ?Sized + NixPath>(
237237
}
238238
}
239239

240-
#[cfg(all(target_os = "linux", target_env = "gnu",))]
240+
#[cfg(all(target_os = "linux", target_env = "gnu"))]
241241
#[cfg(feature = "fs")]
242242
libc_bitflags! {
243243
#[cfg_attr(docsrs, doc(cfg(feature = "fs")))]
@@ -250,10 +250,7 @@ libc_bitflags! {
250250

251251
feature! {
252252
#![feature = "fs"]
253-
#[cfg(all(
254-
target_os = "linux",
255-
target_env = "gnu",
256-
))]
253+
#[cfg(all(target_os = "linux", target_env = "gnu"))]
257254
pub fn renameat2<P1: ?Sized + NixPath, P2: ?Sized + NixPath>(
258255
old_dirfd: Option<RawFd>,
259256
old_path: &P1,

src/sys/socket/mod.rs

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2221,14 +2221,14 @@ pub fn recvfrom<T: SockaddrLike>(
22212221
buf.as_ptr() as *mut c_void,
22222222
buf.len() as size_t,
22232223
0,
2224-
addr.as_mut_ptr() as *mut libc::sockaddr,
2224+
addr.as_mut_ptr() as *mut sockaddr,
22252225
&mut len as *mut socklen_t,
22262226
))? as usize;
22272227

22282228
Ok((
22292229
ret,
22302230
T::from_raw(
2231-
addr.assume_init().as_ptr() as *const libc::sockaddr,
2231+
addr.assume_init().as_ptr() as *const sockaddr,
22322232
Some(len),
22332233
),
22342234
))
@@ -2336,11 +2336,8 @@ pub fn getpeername<T: SockaddrLike>(fd: RawFd) -> Result<T> {
23362336
let mut addr = mem::MaybeUninit::<T>::uninit();
23372337
let mut len = T::size();
23382338

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);
23442341

23452342
Errno::result(ret)?;
23462343

@@ -2356,11 +2353,8 @@ pub fn getsockname<T: SockaddrLike>(fd: RawFd) -> Result<T> {
23562353
let mut addr = mem::MaybeUninit::<T>::uninit();
23572354
let mut len = T::size();
23582355

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);
23642358

23652359
Errno::result(ret)?;
23662360

0 commit comments

Comments
 (0)