diff options
| author | bors <bors@rust-lang.org> | 2019-03-30 22:15:05 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-03-30 22:15:05 +0000 |
| commit | b0fcfa7d6135ecfdfebd325683890ae6dcf5eb18 (patch) | |
| tree | 4814d703c2e0a716fb0fe5ac615763826937d04b /src | |
| parent | befeeb7c083c9e5edddc86563cc461185d897a13 (diff) | |
| parent | 7da27b261a7b69ba77aa60ef4430c4cd2b9aedf6 (diff) | |
| download | rust-b0fcfa7d6135ecfdfebd325683890ae6dcf5eb18.tar.gz rust-b0fcfa7d6135ecfdfebd325683890ae6dcf5eb18.zip | |
Auto merge of #59575 - Centril:rollup, r=Centril
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/doc/rust.css | 6 | ||||
| -rw-r--r-- | src/doc/unstable-book/book.toml | 2 | ||||
| -rw-r--r-- | src/libstd/macros.rs | 6 |
3 files changed, 8 insertions, 6 deletions
diff --git a/src/doc/rust.css b/src/doc/rust.css index 631f64a11db..a92d4ff54db 100644 --- a/src/doc/rust.css +++ b/src/doc/rust.css @@ -14,19 +14,19 @@ font-family: 'Source Serif Pro'; font-style: normal; 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-family: 'Source Serif Pro'; font-style: italic; font-weight: 400; - src: url("Heuristica-Italic.woff") format('woff'); + src: url("SourceSerifPro-It.ttf.woff") format('woff'); } @font-face { font-family: 'Source Serif Pro'; font-style: normal; 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-family: 'Source Code Pro'; diff --git a/src/doc/unstable-book/book.toml b/src/doc/unstable-book/book.toml new file mode 100644 index 00000000000..5534340f0db --- /dev/null +++ b/src/doc/unstable-book/book.toml @@ -0,0 +1,2 @@ +[book] +title = "The Rust Unstable Book" diff --git a/src/libstd/macros.rs b/src/libstd/macros.rs index 0e0292277e1..be4db1f737d 100644 --- a/src/libstd/macros.rs +++ b/src/libstd/macros.rs @@ -240,7 +240,7 @@ macro_rules! eprintln { /// 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. /// 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 /// @@ -315,8 +315,8 @@ macro_rules! eprintln { /// file and line whenever it's reached. /// /// [stderr]: https://en.wikipedia.org/wiki/Standard_streams#Standard_error_(stderr) -/// [debug-log]: https://docs.rs/log/*/log/macro.debug.html -/// [log]: https://docs.rs/log/ +/// [`debug!`]: https://docs.rs/log/*/log/macro.debug.html +/// [`log`]: https://crates.io/crates/log #[macro_export] #[stable(feature = "dbg_macro", since = "1.32.0")] macro_rules! dbg { |