diff options
| author | bors <bors@rust-lang.org> | 2017-05-26 15:31:49 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-05-26 15:31:49 +0000 |
| commit | 256e497fe63bf4b13f7c0b58fa17360ca849c54d (patch) | |
| tree | 48ce0f683bf00fa6f1225aa1a77ba735b03412ad /src/libstd | |
| parent | c732446eddeb2d387763c7974d7e78217e44519a (diff) | |
| parent | 252a28638396d72f4c3a3dff6717b7aaddc017cc (diff) | |
| download | rust-256e497fe63bf4b13f7c0b58fa17360ca849c54d.tar.gz rust-256e497fe63bf4b13f7c0b58fa17360ca849c54d.zip | |
Auto merge of #42245 - frewsxcv:rollup, r=frewsxcv
Rollup of 7 pull requests - Successful merges: #42169, #42215, #42216, #42224, #42230, #42236, #42241 - Failed merges:
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/fs.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/fs.rs b/src/libstd/fs.rs index 528d903b8b0..69843199348 100644 --- a/src/libstd/fs.rs +++ b/src/libstd/fs.rs @@ -1545,7 +1545,7 @@ pub fn create_dir<P: AsRef<Path>>(path: P) -> io::Result<()> { /// determined to not exist) are outlined by `fs::create_dir`. /// /// Notable exception is made for situations where any of the directories -/// specified in the `path` could not be created as it was created concurrently. +/// specified in the `path` could not be created as it was being created concurrently. /// Such cases are considered success. In other words: calling `create_dir_all` /// concurrently from multiple threads or processes is guaranteed to not fail /// due to race itself. |