Skip to content

Commit 8364347

Browse files
authored
Rollup merge of rust-lang#128368 - nnethercote:rustfmt-tweaks, r=cuviper
Formatting tweaks Some small post-rust-lang#125443 formatting tweaks. r? `@cuviper`
2 parents b3ebd3b + 70fcf9e commit 8364347

File tree

4 files changed

+5
-3
lines changed

4 files changed

+5
-3
lines changed

compiler/rustc_lint/src/macro_expr_fragment_specifier_2024_migration.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
//! Migration code for the `expr_fragment_specifier_2024`
2-
//! rule.
1+
//! Migration code for the `expr_fragment_specifier_2024` rule.
2+
33
use rustc_ast::token::{Token, TokenKind};
44
use rustc_ast::tokenstream::{TokenStream, TokenTree};
55
use rustc_session::lint::FutureIncompatibilityReason;

library/std/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -671,7 +671,6 @@ mod panicking;
671671
#[allow(dead_code, unused_attributes, fuzzy_provenance_casts, unsafe_op_in_unsafe_fn)]
672672
mod backtrace_rs;
673673

674-
// Re-export macros defined in core.
675674
#[unstable(feature = "cfg_match", issue = "115585")]
676675
pub use core::cfg_match;
677676
#[unstable(
@@ -690,6 +689,7 @@ pub use core::{
690689
env, file, format_args, format_args_nl, include, include_bytes, include_str, line, log_syntax,
691690
module_path, option_env, stringify, trace_macros,
692691
};
692+
// Re-export macros defined in core.
693693
#[stable(feature = "rust1", since = "1.0.0")]
694694
#[allow(deprecated, deprecated_in_future)]
695695
pub use core::{

library/std/src/sys/pal/sgx/thread.rs

+1
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;

library/std/src/sys/pal/windows/net.rs

+1
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};

0 commit comments

Comments
 (0)