about summary refs log tree commit diff
diff options
context:
space:
mode:
authorYuki Okushi <huyuumi.dev@gmail.com>2021-03-28 01:33:11 +0900
committerGitHub <noreply@github.com>2021-03-28 01:33:11 +0900
commit1f33a6a0daa472260aacd6788a84b27ba2c57f2b (patch)
tree1f02937f61552341217d735b9661da2836067721
parent101003881418d23fee3fcb1b1721a216a366f2da (diff)
parent5495ce087438ec85ebd252cf3339c30cedad95d8 (diff)
downloadrust-1f33a6a0daa472260aacd6788a84b27ba2c57f2b.tar.gz
rust-1f33a6a0daa472260aacd6788a84b27ba2c57f2b.zip
Rollup merge of #79399 - pickfire:patch-3, r=JohnTitor
Use detailed and shorter fs error explaination

Includes suggestion from `@the8472` https://github.com/rust-lang/rust/issues/79390#issuecomment-733263336
-rw-r--r--library/std/src/fs.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/library/std/src/fs.rs b/library/std/src/fs.rs
index ccbc69a975c..0b9b61180f6 100644
--- a/library/std/src/fs.rs
+++ b/library/std/src/fs.rs
@@ -1677,9 +1677,9 @@ pub fn rename<P: AsRef<Path>, Q: AsRef<Path>>(from: P, to: Q) -> io::Result<()>
 /// This function will return an error in the following situations, but is not
 /// limited to just these cases:
 ///
-/// * The `from` path is not a file.
-/// * The `from` file does not exist.
-/// * The current process does not have the permission rights to access
+/// * `from` is neither a regular file nor a symlink to a regular file.
+/// * `from` does not exist.
+/// * The current process does not have the permission rights to read
 ///   `from` or write `to`.
 ///
 /// # Examples