diff options
| author | bors <bors@rust-lang.org> | 2019-07-14 10:23:05 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-07-14 10:23:05 +0000 |
| commit | 7d41ebf768faca490addc7c616b3a9274621f0e9 (patch) | |
| tree | 510b514d94d14bb1bf78d7c85468e3bf11a9713d | |
| parent | 03a68d6973c4165563b97b86c7159a157ae1b109 (diff) | |
| parent | 4f1127a2bf787edb5e1b570ebafbe72c54d6d47b (diff) | |
| download | rust-7d41ebf768faca490addc7c616b3a9274621f0e9.tar.gz rust-7d41ebf768faca490addc7c616b3a9274621f0e9.zip | |
Auto merge of #62464 - GuillaumeGomez:add-missing-urls-osstr, r=QuietMisdreavus
Add missing urls for osstr r? @QuietMisdreavus
| -rw-r--r-- | src/libstd/ffi/os_str.rs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/libstd/ffi/os_str.rs b/src/libstd/ffi/os_str.rs index c7c5849a00f..54e1c876f4c 100644 --- a/src/libstd/ffi/os_str.rs +++ b/src/libstd/ffi/os_str.rs @@ -32,7 +32,7 @@ use crate::sys_common::{AsInner, IntoInner, FromInner}; /// in each pair are owned strings; the latter are borrowed /// references. /// -/// Note, `OsString` and `OsStr` internally do not necessarily hold strings in +/// Note, `OsString` and [`OsStr`] internally do not necessarily hold strings in /// the form native to the platform; While on Unix, strings are stored as a /// sequence of 8-bit values, on Windows, where strings are 16-bit value based /// as just discussed, strings are also actually stored as a sequence of 8-bit @@ -667,10 +667,11 @@ impl From<&OsStr> for Box<OsStr> { #[stable(feature = "os_string_from_box", since = "1.18.0")] impl From<Box<OsStr>> for OsString { - /// Converts a `Box<OsStr>` into a `OsString` without copying or allocating. + /// Converts a [`Box`]`<`[`OsStr`]`>` into a `OsString` without copying or + /// allocating. /// /// [`Box`]: ../boxed/struct.Box.html - /// [`OsString`]: ../ffi/struct.OsString.html + /// [`OsStr`]: ../ffi/struct.OsStr.html fn from(boxed: Box<OsStr>) -> OsString { boxed.into_os_string() } |
