Skip to content

Commit 1b7864e

Browse files
authored
Rollup merge of rust-lang#60382 - Manishearth:revert-code-font, r=GuillaumeGomez
Revert "Update Source Code Pro fonts to version 2.030" Temporary fix for rust-lang#60365 rust-lang#60146 updated all fonts (not just the fonts that were buggy), however it looks like the new Source Code Pro is buggy. We should test this out of tree: `cargo doc` on anything, replace the font in `target/doc`, and use `python -m SimpleHTTPServer` to see what's going on. Till we figure that out, I'll just back this out. r? @GuillaumeGomez This reverts commit 6bafc58.
2 parents e3ff055 + 7aab005 commit 1b7864e

File tree

5 files changed

+3
-3
lines changed

5 files changed

+3
-3
lines changed

Diff for: src/librustdoc/html/render.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -938,7 +938,7 @@ themePicker.onblur = handleThemeButtonsBlur;
938938
static_files::source_code_pro::REGULAR)?;
939939
write(cx.dst.join("SourceCodePro-Semibold.woff"),
940940
static_files::source_code_pro::SEMIBOLD)?;
941-
write(cx.dst.join("SourceCodePro-LICENSE.md"),
941+
write(cx.dst.join("SourceCodePro-LICENSE.txt"),
942942
static_files::source_code_pro::LICENSE)?;
943943
write(cx.dst.join("LICENSE-MIT.txt"),
944944
static_files::LICENSE_MIT)?;

Diff for: src/librustdoc/html/static/SourceCodePro-LICENSE.md renamed to src/librustdoc/html/static/SourceCodePro-LICENSE.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ with others.
1818

1919
The OFL allows the licensed fonts to be used, studied, modified and
2020
redistributed freely as long as they are not sold by themselves. The
21-
fonts, including any derivative works, can be bundled, embedded,
21+
fonts, including any derivative works, can be bundled, embedded,
2222
redistributed and/or sold with any software provided that any reserved
2323
names are not used by derivative works. The fonts and derivatives,
2424
however, cannot be released under any other type of license. The
-39.5 KB
Binary file not shown.
-39.3 KB
Binary file not shown.

Diff for: src/librustdoc/html/static_files.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ pub mod source_code_pro {
103103
pub static SEMIBOLD: &'static [u8] = include_bytes!("static/SourceCodePro-Semibold.woff");
104104

105105
/// The file `SourceCodePro-LICENSE.txt`, the license text of the Source Code Pro font.
106-
pub static LICENSE: &'static [u8] = include_bytes!("static/SourceCodePro-LICENSE.md");
106+
pub static LICENSE: &'static [u8] = include_bytes!("static/SourceCodePro-LICENSE.txt");
107107
}
108108

109109
/// Files related to the sidebar in rustdoc sources.

0 commit comments

Comments
 (0)