Skip to content

Commit dd7fc54

Browse files
committed
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`
2 parents b5c9e24 + 16b1a6f commit dd7fc54

File tree

3 files changed

+11
-1
lines changed

3 files changed

+11
-1
lines changed

library/alloc/src/boxed.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -815,7 +815,7 @@ impl From<Cow<'_, str>> for Box<str> {
815815

816816
#[stable(feature = "boxed_str_conv", since = "1.19.0")]
817817
impl From<Box<str>> for Box<[u8]> {
818-
/// Converts a `Box<str>>` into a `Box<[u8]>`
818+
/// Converts a `Box<str>` into a `Box<[u8]>`
819819
///
820820
/// This conversion does not allocate on the heap and happens in place.
821821
///

library/std/src/primitive_docs.rs

+2
Original file line numberDiff line numberDiff line change
@@ -1118,6 +1118,8 @@ mod prim_ref {}
11181118
/// For more information and a list of supported ABIs, see [the nomicon's
11191119
/// section on foreign calling conventions][nomicon-abi].
11201120
///
1121+
/// [nomicon-abi]: ../nomicon/ffi.html#foreign-calling-conventions
1122+
///
11211123
/// ### Variadic functions
11221124
///
11231125
/// Extern function declarations with the "C" or "cdecl" ABIs can also be *variadic*, allowing them

src/librustdoc/html/static/rustdoc.css

+8
Original file line numberDiff line numberDiff line change
@@ -1540,6 +1540,14 @@ h4 > .notable-traits {
15401540
left: 0;
15411541
top: 100%;
15421542
}
1543+
1544+
/* We don't display the help button on mobile devices. */
1545+
.help-button {
1546+
display: none;
1547+
}
1548+
.search-container > div {
1549+
width: calc(100% - 32px);
1550+
}
15431551
}
15441552

15451553
@media print {

0 commit comments

Comments
 (0)