From 9b20ca1cfc8af049c6c6ad0f1c23a77d5ea53f91 Mon Sep 17 00:00:00 2001
From: Chris Denton <chris@chrisdenton.dev>
Date: Thu, 6 Mar 2025 14:18:18 +0000
Subject: [PATCH] Return OutOfMemoryError and update docs

(cherry picked from commit 3cb53df1feaba73b84344c8c0e3dc4120ad8c95b)
---
 library/std/src/fs.rs                 | 2 +-
 library/std/src/sys/pal/windows/fs.rs | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/library/std/src/fs.rs b/library/std/src/fs.rs
index 83b009c86dc0..793946692312 100644
--- a/library/std/src/fs.rs
+++ b/library/std/src/fs.rs
@@ -2425,7 +2425,7 @@ pub fn symlink_metadata<P: AsRef<Path>>(path: P) -> io::Result<Metadata> {
 /// # Platform-specific behavior
 ///
 /// This function currently corresponds to the `rename` function on Unix
-/// and the `SetFileInformationByHandle` function on Windows.
+/// and the `MoveFileExW` or `SetFileInformationByHandle` function on Windows.
 ///
 /// Because of this, the behavior when both `from` and `to` exist differs. On
 /// Unix, if `from` is a directory, `to` must also be an (empty) directory. If
diff --git a/library/std/src/sys/pal/windows/fs.rs b/library/std/src/sys/pal/windows/fs.rs
index 8ef565ec048a..7ae36ba943ba 100644
--- a/library/std/src/sys/pal/windows/fs.rs
+++ b/library/std/src/sys/pal/windows/fs.rs
@@ -1,6 +1,6 @@
 use super::api::{self, WinError};
 use super::{IoResult, to_u16s};
-use crate::alloc::{Layout, alloc, dealloc, handle_alloc_error};
+use crate::alloc::{Layout, alloc, dealloc};
 use crate::borrow::Cow;
 use crate::ffi::{OsStr, OsString, c_void};
 use crate::io::{self, BorrowedCursor, Error, IoSlice, IoSliceMut, SeekFrom};
@@ -1280,7 +1280,7 @@ pub fn rename(old: &Path, new: &Path) -> io::Result<()> {
             unsafe {
                 file_rename_info = alloc(layout).cast::<c::FILE_RENAME_INFO>();
                 if file_rename_info.is_null() {
-                    handle_alloc_error(layout);
+                    return Err(io::ErrorKind::OutOfMemory.into());
                 }
 
                 (&raw mut (*file_rename_info).Anonymous).write(c::FILE_RENAME_INFO_0 {