Skip to content

Commit

Permalink
Auto merge of rust-lang#77981 - GuillaumeGomez:rollup-64ydc5g, r=Guil…
Browse files Browse the repository at this point in the history
…laumeGomez

Rollup of 3 pull requests

Successful merges:

 - rust-lang#77963 (Fix link to foreign calling conventions)
 - rust-lang#77978 (Fix typo in documentation)
 - rust-lang#77979 (Hide help button on mobile)

Failed merges:

r? `@ghost`
  • Loading branch information
bors committed Oct 15, 2020
2 parents b5c9e24 + 16b1a6f commit dd7fc54
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 1 deletion.
2 changes: 1 addition & 1 deletion library/alloc/src/boxed.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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.
///
Expand Down
2 changes: 2 additions & 0 deletions library/std/src/primitive_docs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 8 additions & 0 deletions src/librustdoc/html/static/rustdoc.css
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down

0 comments on commit dd7fc54

Please sign in to comment.