diff options
| author | bors <bors@rust-lang.org> | 2021-08-23 20:10:29 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-08-23 20:10:29 +0000 |
| commit | a49e38e672c60da788360e088f00ad12353e3913 (patch) | |
| tree | 4fa9f598720e53ebe4efbe6499c6d61dcf120326 /library/std/src/os | |
| parent | 9583fd1bdd0127328e25e5b8c24dff575ec2c86b (diff) | |
| parent | e7101326160ebf6642339a5099d22f6502bf2ae4 (diff) | |
| download | rust-a49e38e672c60da788360e088f00ad12353e3913.tar.gz rust-a49e38e672c60da788360e088f00ad12353e3913.zip | |
Auto merge of #88265 - m-ou-se:rollup-soymv20, r=m-ou-se
Rollup of 6 pull requests Successful merges: - #87976 (Account for tabs when highlighting multiline code suggestions) - #88174 (Clarify some wording in Rust 2021 lint docs) - #88188 (Greatly improve limitation handling on parallel rustdoc GUI test run) - #88230 (Fix typos “a”→“an”) - #88232 (Add notes to macro-not-found diagnostics to point out how things with the same name were not a match.) - #88259 (Do not mark `-Z thir-unsafeck` as unsound anymore) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'library/std/src/os')
| -rw-r--r-- | library/std/src/os/unix/net/ancillary.rs | 4 | ||||
| -rw-r--r-- | library/std/src/os/windows/ffi.rs | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/library/std/src/os/unix/net/ancillary.rs b/library/std/src/os/unix/net/ancillary.rs index cd429d14269..1f9d42812ec 100644 --- a/library/std/src/os/unix/net/ancillary.rs +++ b/library/std/src/os/unix/net/ancillary.rs @@ -279,7 +279,7 @@ pub enum AncillaryData<'a> { } impl<'a> AncillaryData<'a> { - /// Create a `AncillaryData::ScmRights` variant. + /// Create an `AncillaryData::ScmRights` variant. /// /// # Safety /// @@ -291,7 +291,7 @@ impl<'a> AncillaryData<'a> { AncillaryData::ScmRights(scm_rights) } - /// Create a `AncillaryData::ScmCredentials` variant. + /// Create an `AncillaryData::ScmCredentials` variant. /// /// # Safety /// diff --git a/library/std/src/os/windows/ffi.rs b/library/std/src/os/windows/ffi.rs index c89b9ff1efa..8d29fa7d66f 100644 --- a/library/std/src/os/windows/ffi.rs +++ b/library/std/src/os/windows/ffi.rs @@ -30,7 +30,7 @@ //! [`OsString`] is the Rust wrapper for owned strings in the //! preferred representation of the operating system. On Windows, //! this struct gets augmented with an implementation of the -//! [`OsStringExt`] trait, which has a [`OsStringExt::from_wide`] method. This +//! [`OsStringExt`] trait, which has an [`OsStringExt::from_wide`] method. This //! lets you create an [`OsString`] from a `&[u16]` slice; presumably //! you get such a slice out of a `WCHAR` Windows API. //! |