Windows: Fix error in `fs::rename` on Windows 1607 #137528

ChrisDenton · 2025-02-24T10:10:12Z

There's a bug in our Windows implementation of fs::rename that only manifests on a specific version of Windows. Both newer and older versions of Windows work.

I took the safest route to fixing this by using the old MoveFileExW function to implement this and only falling back to the new behaviour if that fails. This is similar to what is done in unlink (just above this function).

try-job: dist-x86_64-mingw
try-job: dist-x86_64-msvc

ChrisDenton · 2025-02-24T10:12:15Z

@bors try

Windows: Fix error in `fs::rename` on Windows 1607 Fixes rust-lang#137499 There's a bug in our Windows implementation of `fs::rename` that only manifests on a specific version of Windows. Both newer and older versions of Windows work. I took the safest route to fixing this by using the old `MoveFileExW` function to implement this and only falling back to the new behaviour if that fails. This is similar to what is done in `unlink` (just above this function). try-job: dist-x86_64-mingw try-job: dist-x86_64-msvc `@bors` r? ghost

ChrisDenton · 2025-02-24T12:43:58Z

r? libs

ChrisDenton · 2025-02-24T19:10:16Z

@bors try

Windows: Fix error in `fs::rename` on Windows 1607 Fixes rust-lang#137499 There's a bug in our Windows implementation of `fs::rename` that only manifests on a specific version of Windows. Both newer and older versions of Windows work. I took the safest route to fixing this by using the old `MoveFileExW` function to implement this and only falling back to the new behaviour if that fails. This is similar to what is done in `unlink` (just above this function). try-job: dist-x86_64-mingw try-job: dist-x86_64-msvc

bors · 2025-02-24T19:11:31Z

⌛ Trying commit 7e5b1c2 with merge 757f022...

bors · 2025-02-24T21:34:03Z

☀️ Try build successful - checks-actions
Build commit: 757f022 (757f02226a4242da9087c892a4865d328700bea7)

ChrisDenton · 2025-02-25T00:54:48Z

This has now been tested and does fix the issue.

joboet

The changes look good to me, but I think the fs::rename documentation will need an update. Also, it might be nice to return an error if the memory allocation fails.

joboet · 2025-03-06T13:44:40Z

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

+            unsafe {
+                file_rename_info = alloc(layout).cast::<c::FILE_RENAME_INFO>();
+                if file_rename_info.is_null() {
+                    handle_alloc_error(layout);


We could also return an OutOfMemory error here...

joboet · 2025-03-06T20:11:16Z

Great, this looks fine.
@bors r+

bors · 2025-03-06T20:11:18Z

📌 Commit 3a726b1 has been approved by joboet

It is now in the queue for this repository.

Windows: Fix error in `fs::rename` on Windows 1607 Fixes rust-lang#137499 There's a bug in our Windows implementation of `fs::rename` that only manifests on a specific version of Windows. Both newer and older versions of Windows work. I took the safest route to fixing this by using the old `MoveFileExW` function to implement this and only falling back to the new behaviour if that fails. This is similar to what is done in `unlink` (just above this function). try-job: dist-x86_64-mingw try-job: dist-x86_64-msvc

…kingjubilee Rollup of 12 pull requests Successful merges: - rust-lang#136667 (Revert vita's c_char back to i8) - rust-lang#136780 (std: move stdio to `sys`) - rust-lang#137107 (Override default `Write` methods for cursor-like types) - rust-lang#137363 (compiler: factor Windows x86-32 ABI impl into its own file) - rust-lang#137528 (Windows: Fix error in `fs::rename` on Windows 1607) - rust-lang#137537 (Prevent `rmake.rs` from using unstable features, and fix 3 run-make tests that currently do) - rust-lang#137777 (Specialize `OsString::push` and `OsString as From` for UTF-8) - rust-lang#137832 (Fix crash in BufReader::peek()) - rust-lang#137904 (Improve the generic MIR in the default `PartialOrd::le` and friends) - rust-lang#138115 (Suggest typo fix for static lifetime) - rust-lang#138125 (Simplify `printf` and shell format suggestions) - rust-lang#138129 (Stabilize const_char_classify, const_sockaddr_setters) r? `@ghost` `@rustbot` modify labels: rollup

Windows: Fix error in `fs::rename` on Windows 1607 Fixes rust-lang#137499 There's a bug in our Windows implementation of `fs::rename` that only manifests on a specific version of Windows. Both newer and older versions of Windows work. I took the safest route to fixing this by using the old `MoveFileExW` function to implement this and only falling back to the new behaviour if that fails. This is similar to what is done in `unlink` (just above this function). try-job: dist-x86_64-mingw try-job: dist-x86_64-msvc

bors · 2025-03-07T17:44:11Z

☔ The latest upstream changes (presumably #138155) made this pull request unmergeable. Please resolve the merge conflicts.

ChrisDenton · 2025-03-07T18:01:26Z

Rebased. Code is otherwise unchanged.

@bors r=joboet

bors · 2025-03-07T18:01:29Z

📌 Commit 3cb53df has been approved by joboet

It is now in the queue for this repository.

Rollup of 5 pull requests Successful merges: - rust-lang#136642 (Put the alloc unit tests in a separate alloctests package) - rust-lang#137528 (Windows: Fix error in `fs::rename` on Windows 1607) - rust-lang#137685 (self-contained linker: conservatively default to `-znostart-stop-gc` on x64 linux) - rust-lang#137757 (On long spans, trim the middle of them to make them fit in the terminal width) - rust-lang#138189 (Mention `env` and `option_env` macros in `std::env::var` docs) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#137528 - ChrisDenton:rename-win, r=joboet Windows: Fix error in `fs::rename` on Windows 1607 Fixes rust-lang#137499 There's a bug in our Windows implementation of `fs::rename` that only manifests on a specific version of Windows. Both newer and older versions of Windows work. I took the safest route to fixing this by using the old `MoveFileExW` function to implement this and only falling back to the new behaviour if that fails. This is similar to what is done in `unlink` (just above this function). try-job: dist-x86_64-mingw try-job: dist-x86_64-msvc

rustbot added O-windows Operating system: Windows S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-libs Relevant to the library team, which will review and decide on the PR/issue. labels Feb 24, 2025

This comment was marked as outdated.

Sign in to view

rustbot assigned joboet Feb 24, 2025

ChrisDenton force-pushed the rename-win branch from 9f75c8e to 7e5b1c2 Compare February 24, 2025 17:28

nabijaczleweli approved these changes Feb 25, 2025

View reviewed changes

joboet requested changes Mar 6, 2025

View reviewed changes

rustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 6, 2025

ChrisDenton force-pushed the rename-win branch from 877fbc9 to 3a726b1 Compare March 6, 2025 14:22

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 6, 2025

Fulgen301 mentioned this pull request Mar 7, 2025

Win: Fix std::fs::rename failing on Windows Server by attempting the non-atomic rename first #138133

Open

workingjubilee mentioned this pull request Mar 7, 2025

Rollup of 12 pull requests #138146

Closed

jhpratt mentioned this pull request Mar 7, 2025

Rollup of 13 pull requests #138152

Closed

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 7, 2025

ChrisDenton added 2 commits March 7, 2025 17:51

Windows: Use MoveFileEx by default in fs:rename

0dfe2ae

Return OutOfMemoryError and update docs

3cb53df

ChrisDenton force-pushed the rename-win branch from 3a726b1 to 3cb53df Compare March 7, 2025 18:00

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 7, 2025

jhpratt mentioned this pull request Mar 8, 2025

Rollup of 5 pull requests #138208

Merged

bors merged commit 0c67061 into rust-lang:master Mar 8, 2025
6 checks passed

rustbot added this to the 1.87.0 milestone Mar 8, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Windows: Fix error in `fs::rename` on Windows 1607 #137528

Windows: Fix error in `fs::rename` on Windows 1607 #137528

ChrisDenton commented Feb 24, 2025 •

edited

Loading

ChrisDenton commented Feb 24, 2025

This comment was marked as outdated.

This comment was marked as outdated.

ChrisDenton commented Feb 24, 2025

ChrisDenton commented Feb 24, 2025

bors commented Feb 24, 2025

bors commented Feb 24, 2025

ChrisDenton commented Feb 25, 2025

joboet left a comment

joboet Mar 6, 2025

ChrisDenton Mar 6, 2025

joboet commented Mar 6, 2025

bors commented Mar 6, 2025

bors commented Mar 7, 2025

ChrisDenton commented Mar 7, 2025

bors commented Mar 7, 2025

Windows: Fix error in fs::rename on Windows 1607 #137528

Windows: Fix error in fs::rename on Windows 1607 #137528

Conversation

ChrisDenton commented Feb 24, 2025 • edited Loading

ChrisDenton commented Feb 24, 2025

This comment was marked as outdated.

This comment was marked as outdated.

ChrisDenton commented Feb 24, 2025

ChrisDenton commented Feb 24, 2025

bors commented Feb 24, 2025

bors commented Feb 24, 2025

ChrisDenton commented Feb 25, 2025

joboet left a comment

Choose a reason for hiding this comment

joboet Mar 6, 2025

Choose a reason for hiding this comment

ChrisDenton Mar 6, 2025

Choose a reason for hiding this comment

joboet commented Mar 6, 2025

bors commented Mar 6, 2025

bors commented Mar 7, 2025

ChrisDenton commented Mar 7, 2025

bors commented Mar 7, 2025

Windows: Fix error in `fs::rename` on Windows 1607 #137528

Windows: Fix error in `fs::rename` on Windows 1607 #137528

ChrisDenton commented Feb 24, 2025 •

edited

Loading