Skip to content

Commit

Permalink
Unrolled build for rust-lang#126287
Browse files Browse the repository at this point in the history
Rollup merge of rust-lang#126287 - nnethercote:reformat-cranelift-patch, r=bjorn3

Update a cranelift patch file for formatting changes.

PR rust-lang#125443 will reformat all the use declarations in the repo. This would break a patch kept in `rustc_codegen_cranelift` that gets applied to `library/std/src/sys/pal/windows/rand.rs`.

So this commit formats the use declarations in `library/std/src/sys/pal/windows/rand.rs` in advance of rust-lang#125443 and updates the patch file accordingly.

The motivation is that rust-lang#125443 is a huge change and we want to get fiddly little changes like this out of the way so it can be nothing more than an `x fmt --all`.

r? ``@bjorn3``
  • Loading branch information
rust-timer authored Jun 12, 2024
2 parents 02c7a59 + 7e7da49 commit 7fec826
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ diff --git a/library/std/src/sys/pal/windows/c.rs b/library/std/src/sys/pal/wind
index ad8e01bfa9b..9ca8e4c16ce 100644
--- a/library/std/src/sys/pal/windows/c.rs
+++ b/library/std/src/sys/pal/windows/c.rs
@@ -323,7 +323,7 @@ pub unsafe fn NtWriteFile(
@@ -312,7 +312,7 @@ pub unsafe fn NtWriteFile(

// Use raw-dylib to import ProcessPrng as we can't rely on there being an import library.
cfg_if::cfg_if! {
Expand All @@ -26,8 +26,8 @@ index e427546222a..f2fe42a4d51 100644
--- a/library/std/src/sys/pal/windows/rand.rs
+++ b/library/std/src/sys/pal/windows/rand.rs
@@ -2,7 +2,7 @@
use core::mem;
use core::ptr;

use crate::sys::c;

-#[cfg(not(target_vendor = "win7"))]
+#[cfg(any())]
Expand Down
4 changes: 2 additions & 2 deletions library/std/src/sys/pal/windows/rand.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use core::{mem, ptr};

use crate::sys::c;
use core::mem;
use core::ptr;

#[cfg(not(target_vendor = "win7"))]
#[inline]
Expand Down

0 comments on commit 7fec826

Please sign in to comment.