Rollup merge of #128368 - nnethercote:rustfmt-tweaks, r=cuviper
Formatting tweaks Some small post-#125443 formatting tweaks. r? ``@cuviper``
This commit is contained in:
commit
2f549aac39
@ -1,5 +1,5 @@
|
||||
//! Migration code for the `expr_fragment_specifier_2024`
|
||||
//! rule.
|
||||
//! Migration code for the `expr_fragment_specifier_2024` rule.
|
||||
|
||||
use rustc_ast::token::{Token, TokenKind};
|
||||
use rustc_ast::tokenstream::{TokenStream, TokenTree};
|
||||
use rustc_session::lint::FutureIncompatibilityReason;
|
||||
|
@ -667,7 +667,6 @@ pub mod arch {
|
||||
#[allow(dead_code, unused_attributes, fuzzy_provenance_casts, unsafe_op_in_unsafe_fn)]
|
||||
mod backtrace_rs;
|
||||
|
||||
// Re-export macros defined in core.
|
||||
#[unstable(feature = "cfg_match", issue = "115585")]
|
||||
pub use core::cfg_match;
|
||||
#[unstable(
|
||||
@ -686,6 +685,7 @@ pub mod arch {
|
||||
env, file, format_args, format_args_nl, include, include_bytes, include_str, line, log_syntax,
|
||||
module_path, option_env, stringify, trace_macros,
|
||||
};
|
||||
// Re-export macros defined in core.
|
||||
#[stable(feature = "rust1", since = "1.0.0")]
|
||||
#[allow(deprecated, deprecated_in_future)]
|
||||
pub use core::{
|
||||
|
@ -1,4 +1,5 @@
|
||||
#![cfg_attr(test, allow(dead_code))] // why is this necessary?
|
||||
|
||||
use super::abi::usercalls;
|
||||
use super::unsupported;
|
||||
use crate::ffi::CStr;
|
||||
|
@ -21,6 +21,7 @@ pub mod netc {
|
||||
//!
|
||||
//! Some Windows API types are not quite what's expected by our cross-platform
|
||||
//! net code. E.g. naming differences or different pointer types.
|
||||
|
||||
use core::ffi::{c_char, c_int, c_uint, c_ulong, c_ushort, c_void};
|
||||
|
||||
use crate::sys::c::{self, ADDRESS_FAMILY, ADDRINFOA, SOCKADDR, SOCKET};
|
||||
|
Loading…
Reference in New Issue
Block a user