Rollup merge of #60382 - Manishearth:revert-code-font, r=GuillaumeGomez

Revert "Update Source Code Pro fonts to version 2.030"

Temporary fix for https://github.com/rust-lang/rust/issues/60365

https://github.com/rust-lang/rust/pull/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 6bafc58cedc6f409dbcd8919a25b2f5d425f42ae.

5 files changed, 3 insertions, 3 deletions

diff --git a/src/librustdoc/html/render.rs b/src/librustdoc/html/render.rs
index be349de05ca..f4af362a557 100644
--- a/src/librustdoc/html/render.rs
+++ b/src/librustdoc/html/render.rs
@@ -938,7 +938,7 @@ themePicker.onblur = handleThemeButtonsBlur;
           static_files::source_code_pro::REGULAR)?;
     write(cx.dst.join("SourceCodePro-Semibold.woff"),
           static_files::source_code_pro::SEMIBOLD)?;
-    write(cx.dst.join("SourceCodePro-LICENSE.md"),
+    write(cx.dst.join("SourceCodePro-LICENSE.txt"),
           static_files::source_code_pro::LICENSE)?;
     write(cx.dst.join("LICENSE-MIT.txt"),
           static_files::LICENSE_MIT)?;
diff --git a/src/librustdoc/html/static/SourceCodePro-LICENSE.md b/src/librustdoc/html/static/SourceCodePro-LICENSE.txt
index 1177330426d..07542572e33 100644
--- a/src/librustdoc/html/static/SourceCodePro-LICENSE.md
+++ b/src/librustdoc/html/static/SourceCodePro-LICENSE.txt
@@ -18,7 +18,7 @@ with others.
 
 The OFL allows the licensed fonts to be used, studied, modified and
 redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded, 
+fonts, including any derivative works, can be bundled, embedded,
 redistributed and/or sold with any software provided that any reserved
 names are not used by derivative works. The fonts and derivatives,
 however, cannot be released under any other type of license. The
diff --git a/src/librustdoc/html/static/SourceCodePro-Regular.woff b/src/librustdoc/html/static/SourceCodePro-Regular.woff
index 117c7e5142c..5576670903a 100644
--- a/src/librustdoc/html/static/SourceCodePro-Regular.woff
+++ b/src/librustdoc/html/static/SourceCodePro-Regular.woff
Binary files differdiff --git a/src/librustdoc/html/static/SourceCodePro-Semibold.woff b/src/librustdoc/html/static/SourceCodePro-Semibold.woff
index 270873a86a0..ca972a11dc4 100644
--- a/src/librustdoc/html/static/SourceCodePro-Semibold.woff
+++ b/src/librustdoc/html/static/SourceCodePro-Semibold.woff
Binary files differdiff --git a/src/librustdoc/html/static_files.rs b/src/librustdoc/html/static_files.rs
index 24fe61e977a..3a2c24b1a96 100644
--- a/src/librustdoc/html/static_files.rs
+++ b/src/librustdoc/html/static_files.rs
@@ -103,7 +103,7 @@ pub mod source_code_pro {
     pub static SEMIBOLD: &'static [u8] = include_bytes!("static/SourceCodePro-Semibold.woff");
 
     /// The file `SourceCodePro-LICENSE.txt`, the license text of the Source Code Pro font.
-    pub static LICENSE: &'static [u8] = include_bytes!("static/SourceCodePro-LICENSE.md");
+    pub static LICENSE: &'static [u8] = include_bytes!("static/SourceCodePro-LICENSE.txt");
 }
 
 /// Files related to the sidebar in rustdoc sources.