nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-23 07:14:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Auto merge of #77981 - GuillaumeGomez:rollup-64ydc5g, r=GuillaumeGomez

Browse Source 
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`
This commit is contained in:
bors 2020-10-15 19:03:32 +00:00
commit dd7fc54ebd
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
library/alloc/src/boxed.rs
View File

@ -815,7 +815,7 @@ impl From<Cow<'_, str>> for Box<str> {
#[stable(feature = "boxed_str_conv", since = "1.19.0")] #[stable(feature = "boxed_str_conv", since = "1.19.0")]
impl From<Box<str>> for Box<[u8]> { 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. /// This conversion does not allocate on the heap and happens in place.
/// ///

2
library/std/src/primitive_docs.rs
View File

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

8
src/librustdoc/html/static/rustdoc.css
View File

@ -1540,6 +1540,14 @@ h4 > .notable-traits {
left: 0; left: 0;
top: 100%; 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 { @media print {