diff options
| author | bors <bors@rust-lang.org> | 2020-10-15 19:03:32 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-10-15 19:03:32 +0000 |
| commit | dd7fc54ebdca419ad9d3ab1e9f5ed14e770768ea (patch) | |
| tree | 0bd7d680937ad49eb0c638618d5c454fefa29e9d | |
| parent | b5c9e2448c9ace53ad5c11585803894651b18b0a (diff) | |
| parent | 16b1a6fa67073cca250f3d0bff5eb15dc8069c0c (diff) | |
| download | rust-dd7fc54ebdca419ad9d3ab1e9f5ed14e770768ea.tar.gz rust-dd7fc54ebdca419ad9d3ab1e9f5ed14e770768ea.zip | |
Auto merge of #77981 - GuillaumeGomez:rollup-64ydc5g, r=GuillaumeGomez
Rollup of 3 pull requests Successful merges: - #77963 (Fix link to foreign calling conventions) - #77978 (Fix typo in documentation) - #77979 (Hide help button on mobile) Failed merges: r? `@ghost`
| -rw-r--r-- | library/alloc/src/boxed.rs | 2 | ||||
| -rw-r--r-- | library/std/src/primitive_docs.rs | 2 | ||||
| -rw-r--r-- | src/librustdoc/html/static/rustdoc.css | 8 |
3 files changed, 11 insertions, 1 deletions
diff --git a/library/alloc/src/boxed.rs b/library/alloc/src/boxed.rs index 5c8c2c5a5a8..0fc81cb2193 100644 --- a/library/alloc/src/boxed.rs +++ b/library/alloc/src/boxed.rs @@ -815,7 +815,7 @@ impl From<Cow<'_, str>> for Box<str> { #[stable(feature = "boxed_str_conv", since = "1.19.0")] impl From<Box<str>> for Box<[u8]> { - /// Converts a `Box<str>>` into a `Box<[u8]>` + /// Converts a `Box<str>` into a `Box<[u8]>` /// /// This conversion does not allocate on the heap and happens in place. /// diff --git a/library/std/src/primitive_docs.rs b/library/std/src/primitive_docs.rs index 81bbf376378..ae678479234 100644 --- a/library/std/src/primitive_docs.rs +++ b/library/std/src/primitive_docs.rs @@ -1118,6 +1118,8 @@ mod prim_ref {} /// For more information and a list of supported ABIs, see [the nomicon's /// section on foreign calling conventions][nomicon-abi]. /// +/// [nomicon-abi]: ../nomicon/ffi.html#foreign-calling-conventions +/// /// ### Variadic functions /// /// Extern function declarations with the "C" or "cdecl" ABIs can also be *variadic*, allowing them diff --git a/src/librustdoc/html/static/rustdoc.css b/src/librustdoc/html/static/rustdoc.css index 80aca24da9f..a163899839d 100644 --- a/src/librustdoc/html/static/rustdoc.css +++ b/src/librustdoc/html/static/rustdoc.css @@ -1540,6 +1540,14 @@ h4 > .notable-traits { left: 0; top: 100%; } + + /* We don't display the help button on mobile devices. */ + .help-button { + display: none; + } + .search-container > div { + width: calc(100% - 32px); + } } @media print { |