Skip to content

Commit

Permalink
style: Run cargo fmt with the new configuration
Browse files Browse the repository at this point in the history
`libc-0.2` version of 236e069 from [1]
(not a direct cherry pick).

[1]: rust-lang#4136
  • Loading branch information
tgross35 committed Nov 25, 2024
1 parent 0d0a745 commit da089f7
Show file tree
Hide file tree
Showing 11 changed files with 20 additions and 30 deletions.
3 changes: 1 addition & 2 deletions build.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
use std::env;
use std::process::{Command, Output};
use std::str;
use std::{env, str};

// List of cfgs this build script is allowed to set. The list is needed to support check-cfg, as we
// need to know all the possible cfgs that this script will set. If you need to set another cfg
Expand Down
3 changes: 2 additions & 1 deletion libc-test/test/cmsg.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@
#[cfg(unix)]
mod t {

use libc::{self, c_uchar, c_uint, c_void, cmsghdr, msghdr};
use std::mem;

use libc::{self, c_uchar, c_uint, c_void, cmsghdr, msghdr};

extern "C" {
pub fn cmsg_firsthdr(msgh: *const msghdr) -> *mut cmsghdr;
// see below
Expand Down
3 changes: 1 addition & 2 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ cfg_if! {
use core::clone::Clone;
#[allow(unused_imports)]
use core::ffi;
pub use core::ffi::c_void;
#[allow(unused_imports)]
use core::fmt;
#[allow(unused_imports)]
Expand All @@ -62,8 +63,6 @@ use core::num;
#[allow(unused_imports)]
use core::option::Option;

pub use core::ffi::c_void;

cfg_if! {
if #[cfg(windows)] {
mod fixed_width_ints;
Expand Down
3 changes: 1 addition & 2 deletions src/unix/linux_like/emscripten/lfs64.rs
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,7 @@ pub unsafe extern "C" fn mmap64(
//
// These aliases are mostly fine though, neither function takes a LFS64-namespaced type as an
// argument, nor do their names clash with any declared types.
pub use open as open64;
pub use openat as openat64;
pub use {open as open64, openat as openat64};

#[inline]
pub unsafe extern "C" fn posix_fadvise64(
Expand Down
3 changes: 1 addition & 2 deletions src/unix/linux_like/linux/musl/lfs64.rs
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,7 @@ pub unsafe extern "C" fn mmap64(
//
// These aliases are mostly fine though, neither function takes a LFS64-namespaced type as an
// argument, nor do their names clash with any declared types.
pub use open as open64;
pub use openat as openat64;
pub use {open as open64, openat as openat64};

#[inline]
pub unsafe extern "C" fn posix_fadvise64(
Expand Down
6 changes: 1 addition & 5 deletions src/unix/nuttx/mod.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
use c_void;
use in6_addr;
use in_addr_t;
use timespec;
use DIR;
use {c_void, in6_addr, in_addr_t, timespec, DIR};

pub type nlink_t = u16;
pub type ino_t = u16;
Expand Down
1 change: 1 addition & 0 deletions src/unix/solarish/compat.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// Solaris, but often needed by other crates.

use core::cmp::min;

use unix::solarish::*;

const PTEM: &[u8] = b"ptem\0";
Expand Down
11 changes: 4 additions & 7 deletions src/unix/solarish/illumos.rs
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
use exit_status;
use NET_MAC_AWARE;
use NET_MAC_AWARE_INHERIT;
use PRIV_AWARE_RESET;
use PRIV_DEBUG;
use PRIV_PFEXEC;
use PRIV_XPOLICY;
use {
exit_status, NET_MAC_AWARE, NET_MAC_AWARE_INHERIT, PRIV_AWARE_RESET, PRIV_DEBUG, PRIV_PFEXEC,
PRIV_XPOLICY,
};

pub type lgrp_rsrc_t = ::c_int;
pub type lgrp_affinity_t = ::c_int;
Expand Down
11 changes: 4 additions & 7 deletions src/unix/solarish/solaris.rs
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
use exit_status;
use NET_MAC_AWARE;
use NET_MAC_AWARE_INHERIT;
use PRIV_AWARE_RESET;
use PRIV_DEBUG;
use PRIV_PFEXEC;
use PRIV_XPOLICY;
use {
exit_status, NET_MAC_AWARE, NET_MAC_AWARE_INHERIT, PRIV_AWARE_RESET, PRIV_DEBUG, PRIV_PFEXEC,
PRIV_XPOLICY,
};

pub type door_attr_t = ::c_uint;
pub type door_id_t = ::c_ulonglong;
Expand Down
3 changes: 2 additions & 1 deletion src/vxworks/mod.rs
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
//! Interface to VxWorks C library
use c_void;
use core::mem::size_of;
use core::ptr::null_mut;

use c_void;

#[cfg_attr(feature = "extra_traits", derive(Debug))]
pub enum DIR {}
impl ::Copy for DIR {}
Expand Down
3 changes: 2 additions & 1 deletion src/wasi/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@
use core::iter::Iterator;

use super::{Send, Sync};
use c_void;

use super::{Send, Sync};

pub type c_char = i8;
pub type c_uchar = u8;
pub type c_schar = i8;
Expand Down

0 comments on commit da089f7

Please sign in to comment.