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

3 files changed

lines changed

Original file line number	Diff line number	Diff line change
@@ -667,7 +667,6 @@ mod panicking;
667	667	#[allow(dead_code, unused_attributes, fuzzy_provenance_casts, unsafe_op_in_unsafe_fn)]
668	668	mod backtrace_rs;
669	669
670		-// Re-export macros defined in core.
671	670	#[unstable(feature = "cfg_match", issue = "115585")]
672	671	pub use core::cfg_match;
673	672	#[unstable(
@@ -686,6 +685,7 @@ pub use core::{
686	685	env, file, format_args, format_args_nl, include, include_bytes, include_str, line, log_syntax,
687	686	module_path, option_env, stringify, trace_macros,
688	687	};
	688	+// Re-export macros defined in core.
689	689	#[stable(feature = "rust1", since = "1.0.0")]
690	690	#[allow(deprecated, deprecated_in_future)]
691	691	pub use core::{

Original file line number	Diff line number	Diff line change
@@ -1,4 +1,5 @@
1	1	#![cfg_attr(test, allow(dead_code))] // why is this necessary?
	2	+
2	3	use super::abi::usercalls;
3	4	use super::unsupported;
4	5	use crate::ffi::CStr;

Original file line number	Diff line number	Diff line change
@@ -21,6 +21,7 @@ pub mod netc {
21	21	//!
22	22	//! Some Windows API types are not quite what's expected by our cross-platform
23	23	//! net code. E.g. naming differences or different pointer types.
	24	+
24	25	use core::ffi::{c_char, c_int, c_uint, c_ulong, c_ushort, c_void};
25	26
26	27	use crate::sys::c::{self, ADDRESS_FAMILY, ADDRINFOA, SOCKADDR, SOCKET};