diff options
| author | bors <bors@rust-lang.org> | 2019-09-15 20:06:49 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-09-15 20:06:49 +0000 |
| commit | 06c94ee79b7baa8bebd039a019ce6adb5ea6a24f (patch) | |
| tree | f01be2bf8919ec224ce79a891326534a3048f0fd /src/libstd | |
| parent | 96d07e0ac9f0c56b95a2561c6cedac0b23a5d2a3 (diff) | |
| parent | 0592d137574189e500438aa300da64f0b1089a60 (diff) | |
| download | rust-06c94ee79b7baa8bebd039a019ce6adb5ea6a24f.tar.gz rust-06c94ee79b7baa8bebd039a019ce6adb5ea6a24f.zip | |
Auto merge of #64491 - Centril:rollup-21wkl69, r=Centril
Rollup of 3 pull requests Successful merges: - #63872 (Document platform-specific behavior of the iterator returned by std::fs::read_dir) - #64250 (save-analysis: Nest typeck tables when processing functions/methods) - #64472 (Don't mark expression with attributes as not needing parentheses) Failed merges: r? @ghost
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/fs.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libstd/fs.rs b/src/libstd/fs.rs index b14e02a2cb4..b5265fe369e 100644 --- a/src/libstd/fs.rs +++ b/src/libstd/fs.rs @@ -1956,7 +1956,8 @@ pub fn remove_dir_all<P: AsRef<Path>>(path: P) -> io::Result<()> { /// # Platform-specific behavior /// /// This function currently corresponds to the `opendir` function on Unix -/// and the `FindFirstFile` function on Windows. +/// and the `FindFirstFile` function on Windows. Advancing the iterator +/// currently corresponds to `readdir` on Unix and `FindNextFile` on Windows. /// Note that, this [may change in the future][changes]. /// /// [changes]: ../io/index.html#platform-specific-behavior |