Skip to content

Commit b0fcfa7

Browse files
committed
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
2 parents befeeb7 + 7da27b2 commit b0fcfa7

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

src/doc/rust.css

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,19 @@
1414
font-family: 'Source Serif Pro';
1515
font-style: normal;
1616
font-weight: 400;
17-
src: local('Source Serif Pro'), url("SourceSerifPro-Regular.woff") format('woff');
17+
src: local('Source Serif Pro'), url("SourceSerifPro-Regular.ttf.woff") format('woff');
1818
}
1919
@font-face {
2020
font-family: 'Source Serif Pro';
2121
font-style: italic;
2222
font-weight: 400;
23-
src: url("Heuristica-Italic.woff") format('woff');
23+
src: url("SourceSerifPro-It.ttf.woff") format('woff');
2424
}
2525
@font-face {
2626
font-family: 'Source Serif Pro';
2727
font-style: normal;
2828
font-weight: 700;
29-
src: local('Source Serif Pro Bold'), url("SourceSerifPro-Bold.woff") format('woff');
29+
src: local('Source Serif Pro Bold'), url("SourceSerifPro-Bold.ttf.woff") format('woff');
3030
}
3131
@font-face {
3232
font-family: 'Source Code Pro';

src/doc/unstable-book/book.toml

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[book]
2+
title = "The Rust Unstable Book"

src/libstd/macros.rs

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

0 commit comments

Comments
 (0)