OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Auto merge of #59575 - Centril:rollup, r=Centril

Browse Source 
Rollup of 3 pull requests

Successful merges:

 - #59405 (doc: use correct body font URLs)
 - #59562 (Changed reference style in dbg macro docs.)
 - #59569 (Add book.toml with title to unstable-book doc)

Failed merges:

r? @ghost
This commit is contained in:
bors 2019-03-30 22:15:05 +00:00
commit b0fcfa7d61
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/doc/rust.css
View File

@ -14,19 +14,19 @@
font-family: 'Source Serif Pro'; font-family: 'Source Serif Pro';
font-style: normal; font-style: normal;
font-weight: 400; font-weight: 400;
src: local('Source Serif Pro'), url("SourceSerifPro-Regular.woff") format('woff'); src: local('Source Serif Pro'), url("SourceSerifPro-Regular.ttf.woff") format('woff');
} }
@font-face { @font-face {
font-family: 'Source Serif Pro'; font-family: 'Source Serif Pro';
font-style: italic; font-style: italic;
font-weight: 400; font-weight: 400;
src: url("Heuristica-Italic.woff") format('woff'); src: url("SourceSerifPro-It.ttf.woff") format('woff');
} }
@font-face { @font-face {
font-family: 'Source Serif Pro'; font-family: 'Source Serif Pro';
font-style: normal; font-style: normal;
font-weight: 700; font-weight: 700;
src: local('Source Serif Pro Bold'), url("SourceSerifPro-Bold.woff") format('woff'); src: local('Source Serif Pro Bold'), url("SourceSerifPro-Bold.ttf.woff") format('woff');
} }
@font-face { @font-face {
font-family: 'Source Code Pro'; font-family: 'Source Code Pro';

2
src/doc/unstable-book/book.toml Normal file
View File

@ -0,0 +1,2 @@
[book]
title = "The Rust Unstable Book"

6
src/libstd/macros.rs
View File

@ -240,7 +240,7 @@ macro_rules! eprintln {
/// Note that the macro is intended as a debugging tool and therefore you /// Note that the macro is intended as a debugging tool and therefore you
/// should avoid having uses of it in version control for longer periods. /// should avoid having uses of it in version control for longer periods.
/// Use cases involving debug output that should be added to version control /// Use cases involving debug output that should be added to version control
/// are better served by macros such as [`debug!`][debug-log] from the [`log`][log] crate. /// are better served by macros such as [`debug!`] from the [`log`] crate.
/// ///
/// # Stability /// # Stability
/// ///
@ -315,8 +315,8 @@ macro_rules! eprintln {
/// file and line whenever it's reached. /// file and line whenever it's reached.
/// ///
/// [stderr]: https://en.wikipedia.org/wiki/Standard_streams#Standard_error_(stderr) /// [stderr]: https://en.wikipedia.org/wiki/Standard_streams#Standard_error_(stderr)
/// [debug-log]: https://docs.rs/log/*/log/macro.debug.html /// [`debug!`]: https://docs.rs/log/*/log/macro.debug.html
/// [log]: https://docs.rs/log/ /// [`log`]: https://crates.io/crates/log
#[macro_export] #[macro_export]
#[stable(feature = "dbg_macro", since = "1.32.0")] #[stable(feature = "dbg_macro", since = "1.32.0")]
macro_rules! dbg { macro_rules! dbg {