about summary refs log tree commit diff
path: root/library/std/src/fs.rs
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2021-03-27 16:34:59 +0000
committerbors <bors@rust-lang.org>2021-03-27 16:34:59 +0000
commitafaf33dcafe9c7068b63eb997df221aa08db7c29 (patch)
tree2bd2416c2a6dcbdf410e6d9f932960b124cb576a /library/std/src/fs.rs
parent101003881418d23fee3fcb1b1721a216a366f2da (diff)
parent1ad7c52812b336c23d86bc4c74c408fe5c850761 (diff)
downloadrust-afaf33dcafe9c7068b63eb997df221aa08db7c29.tar.gz
rust-afaf33dcafe9c7068b63eb997df221aa08db7c29.zip
Auto merge of #83573 - JohnTitor:rollup-28jnzsr, r=JohnTitor
Rollup of 10 pull requests

Successful merges:

 - #79399 (Use detailed and shorter fs error explaination)
 - #83348 (format macro argument parsing fix)
 - #83462 (ExitStatus: print "exit status: {}" rather than "exit code: {}" on unix)
 - #83526 (lazily calls some fns)
 - #83558 (Use DebugStruct::finish_non_exhaustive() in std.)
 - #83559 (Fix Debug implementation for RwLock{Read,Write}Guard.)
 - #83560 (Derive Debug for io::Chain instead of manually implementing it.)
 - #83561 (Improve Debug implementations of Mutex and RwLock.)
 - #83567 (Update rustup cross-compilation docs link)
 - #83569 (Add regression tests for #56445)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'library/std/src/fs.rs')
-rw-r--r--library/std/src/fs.rs8
1 files changed, 4 insertions, 4 deletions
diff --git a/library/std/src/fs.rs b/library/std/src/fs.rs
index ccbc69a975c..860bc130b7d 100644
--- a/library/std/src/fs.rs
+++ b/library/std/src/fs.rs
@@ -1154,7 +1154,7 @@ impl fmt::Debug for Metadata {
             .field("modified", &self.modified())
             .field("accessed", &self.accessed())
             .field("created", &self.created())
-            .finish()
+            .finish_non_exhaustive()
     }
 }
 
@@ -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