Home Original page

Rollup merge of #128368 - nnethercote:rustfmt-tweaks, r=cuviper · model-checking/verify-rust-std@975dc19

3 files changed

lines changed

Original file line numberDiff line numberDiff line change

@@ -667,7 +667,6 @@ mod panicking;

667667

#[allow(dead_code, unused_attributes, fuzzy_provenance_casts, unsafe_op_in_unsafe_fn)]

668668

mod backtrace_rs;

669669
670-

// Re-export macros defined in core.

671670

#[unstable(feature = "cfg_match", issue = "115585")]

672671

pub use core::cfg_match;

673672

#[unstable(

@@ -686,6 +685,7 @@ pub use core::{

686685

env, file, format_args, format_args_nl, include, include_bytes, include_str, line, log_syntax,

687686

module_path, option_env, stringify, trace_macros,

688687

};

688+

// Re-export macros defined in core.

689689

#[stable(feature = "rust1", since = "1.0.0")]

690690

#[allow(deprecated, deprecated_in_future)]

691691

pub use core::{

Original file line numberDiff line numberDiff line change

@@ -1,4 +1,5 @@

11

#![cfg_attr(test, allow(dead_code))] // why is this necessary?

2+
23

use super::abi::usercalls;

34

use super::unsupported;

45

use crate::ffi::CStr;

Original file line numberDiff line numberDiff line change

@@ -21,6 +21,7 @@ pub mod netc {

2121

//!

2222

//! Some Windows API types are not quite what's expected by our cross-platform

2323

//! net code. E.g. naming differences or different pointer types.

24+
2425

use core::ffi::{c_char, c_int, c_uint, c_ulong, c_ushort, c_void};

2526
2627

use crate::sys::c::{self, ADDRESS_FAMILY, ADDRINFOA, SOCKADDR, SOCKET};