diff options
| author | bors <bors@rust-lang.org> | 2019-11-05 09:31:36 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-11-05 09:31:36 +0000 |
| commit | d1fff4a4b213b3341c1ff994061b7965a5932c70 (patch) | |
| tree | 092a1579b1c3ddeccf48280bbf1d0a0294eaa716 /src/libstd/sys | |
| parent | 2e4da3caadc61fab2cfcffebcbfdd72fbcee62b7 (diff) | |
| parent | 1ffa93e5f8229c34286f50d1d79dd410324a7d9d (diff) | |
| download | rust-d1fff4a4b213b3341c1ff994061b7965a5932c70.tar.gz rust-d1fff4a4b213b3341c1ff994061b7965a5932c70.zip | |
Auto merge of #66109 - pietroalbini:rollup-2npidna, r=pietroalbini
Rollup of 10 pull requests Successful merges: - #65136 (Update codegen option documentation.) - #65574 (docs: improve disclaimer regarding LinkedList) - #65720 (Add FFI bindings for LLVM's Module::getInstructionCount()) - #65905 ([doc] fixes for unix/vxworks `OpenOptionsExt::mode`) - #65962 (Fix logic in example.) - #66019 (Improved std::iter::Chain documentation) - #66038 (doc(str): show example of chars().count() under len()) - #66042 (Suggest correct code when encountering an incorrect trait bound referencing the current trait) - #66073 (Do not needlessly write-lock) - #66096 (Add a failing UI test for multiple loops of all kinds in a `const`) Failed merges: r? @ghost
Diffstat (limited to 'src/libstd/sys')
| -rw-r--r-- | src/libstd/sys/unix/ext/fs.rs | 4 | ||||
| -rw-r--r-- | src/libstd/sys/vxworks/ext/fs.rs | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/libstd/sys/unix/ext/fs.rs b/src/libstd/sys/unix/ext/fs.rs index c033c60cbe9..0c52dc5b81b 100644 --- a/src/libstd/sys/unix/ext/fs.rs +++ b/src/libstd/sys/unix/ext/fs.rs @@ -303,10 +303,10 @@ impl PermissionsExt for Permissions { pub trait OpenOptionsExt { /// Sets the mode bits that a new file will be created with. /// - /// If a new file is created as part of a `File::open_opts` call then this + /// If a new file is created as part of an `OpenOptions::open` call then this /// specified `mode` will be used as the permission bits for the new file. /// If no `mode` is set, the default of `0o666` will be used. - /// The operating system masks out bits with the systems `umask`, to produce + /// The operating system masks out bits with the system's `umask`, to produce /// the final permissions. /// /// # Examples diff --git a/src/libstd/sys/vxworks/ext/fs.rs b/src/libstd/sys/vxworks/ext/fs.rs index 7ab7f2a1a26..4a9cc3bd069 100644 --- a/src/libstd/sys/vxworks/ext/fs.rs +++ b/src/libstd/sys/vxworks/ext/fs.rs @@ -304,10 +304,10 @@ impl PermissionsExt for Permissions { pub trait OpenOptionsExt { /// Sets the mode bits that a new file will be created with. /// - /// If a new file is created as part of a `File::open_opts` call then this + /// If a new file is created as part of an `OpenOptions::open` call then this /// specified `mode` will be used as the permission bits for the new file. /// If no `mode` is set, the default of `0o666` will be used. - /// The operating system masks out bits with the systems `umask`, to produce + /// The operating system masks out bits with the system's `umask`, to produce /// the final permissions. /// /// # Examples |