From db0222e3e800cdf725f158e3eaeabcd6f4d55d77 Mon Sep 17 00:00:00 2001
From: Nicholas Nethercote <n.nethercote@gmail.com>
Date: Tue, 30 Jul 2024 07:20:17 +1000
Subject: [PATCH 1/2] Move a comment.

In #125443 this comment ended up in the wrong spot. I'm not sure why;
after careful checking this was the only case I could find like this.
---
 std/src/lib.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/std/src/lib.rs b/std/src/lib.rs
index ee6f5a6f3c0d5..5a33a243743e5 100644
--- a/std/src/lib.rs
+++ b/std/src/lib.rs
@@ -671,7 +671,6 @@ mod panicking;
 #[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(
@@ -690,6 +689,7 @@ pub use core::{
     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::{

From 93b2f7c4e884c12680ddacd2aed9addc0e0995d6 Mon Sep 17 00:00:00 2001
From: Nicholas Nethercote <n.nethercote@gmail.com>
Date: Tue, 30 Jul 2024 07:21:13 +1000
Subject: [PATCH 2/2] Insert some blank lines.

After things that are immediately followed by a `use` declaration and
look like they might apply to that `use` item but actually don't.
---
 std/src/sys/pal/sgx/thread.rs  | 1 +
 std/src/sys/pal/windows/net.rs | 1 +
 2 files changed, 2 insertions(+)

diff --git a/std/src/sys/pal/sgx/thread.rs b/std/src/sys/pal/sgx/thread.rs
index df65d1cc8fc48..cecd53c352c5a 100644
--- a/std/src/sys/pal/sgx/thread.rs
+++ b/std/src/sys/pal/sgx/thread.rs
@@ -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;
diff --git a/std/src/sys/pal/windows/net.rs b/std/src/sys/pal/windows/net.rs
index e27fdb72256f4..ce995f5ed5af7 100644
--- a/std/src/sys/pal/windows/net.rs
+++ b/std/src/sys/pal/windows/net.rs
@@ -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};