summary refs log tree commit diff
path: root/library/std/src/fs.rs
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2025-03-15 16:27:19 +0000
committerbors <bors@rust-lang.org>2025-03-15 16:27:19 +0000
commit4eb161250e340c8f48f66e2b929ef4a5bed7c181 (patch)
treec418bfb9d805b965e00cf7e01f06014ae8d46af2 /library/std/src/fs.rs
parent4d91de4e48198da2e33413efdcd9cd2cc0c46688 (diff)
parent4d11490950147b333cb13c0efb579127e37f7104 (diff)
downloadrust-1.85.1.tar.gz
rust-1.85.1.zip
Auto merge of #138521 - cuviper:stable-next, r=cuviper 1.85.1
[stable] Release 1.85.1

- [Fix the doctest-merging feature of the 2024 Edition.](https://github.com/rust-lang/rust/pull/137899/)
- [Relax some `target_feature` checks when generating docs.](https://github.com/rust-lang/rust/pull/137632/)
- [Fix errors in `std::fs::rename` on Windows 1607.](https://github.com/rust-lang/rust/pull/137528/)
- [Downgrade bootstrap `cc` to fix custom targets.](https://github.com/rust-lang/rust/pull/137460/)
- [Skip submodule updates when building Rust from a source tarball.](https://github.com/rust-lang/rust/pull/137338/)

Added backports to fix CI:

- Remove latest Windows SDK from 32-bit CI #137753
- Do not install rustup on Rust for Linux job #137947

cc `@rust-lang/release`
r? cuviper
Diffstat (limited to 'library/std/src/fs.rs')
-rw-r--r--library/std/src/fs.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/library/std/src/fs.rs b/library/std/src/fs.rs
index 9b752ed1443..f390fabad29 100644
--- a/library/std/src/fs.rs
+++ b/library/std/src/fs.rs
@@ -2402,7 +2402,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