Skip to content

Commit 65f3751

Browse files
Rollup merge of rust-lang#82545 - jsha:woff2, r=GuillaumeGomez
rustdoc: add optional woff2 versions of FiraSans. For browsers that support woff2 (most modern ones: https://caniuse.com/woff2), this offers a reduction in download size for these two fonts from 362k to 257k (32% reduction). It decreases the total page size for `struct.String.html` (counting all subresources) by about 2.5%. If this is interesting, I'm happy to apply the same treatment to the other fonts, but these two are the biggest.
2 parents 812d78f + ad7ed13 commit 65f3751

File tree

5 files changed

+14
-2
lines changed

5 files changed

+14
-2
lines changed

src/librustdoc/html/render/mod.rs

+2
Original file line numberDiff line numberDiff line change
@@ -883,6 +883,8 @@ themePicker.onblur = handleThemeButtonsBlur;
883883
static_files::NORMALIZE_CSS,
884884
options.enable_minification,
885885
)?;
886+
write(cx.dst.join("FiraSans-Regular.woff2"), static_files::fira_sans::REGULAR2)?;
887+
write(cx.dst.join("FiraSans-Medium.woff2"), static_files::fira_sans::MEDIUM2)?;
886888
write(cx.dst.join("FiraSans-Regular.woff"), static_files::fira_sans::REGULAR)?;
887889
write(cx.dst.join("FiraSans-Medium.woff"), static_files::fira_sans::MEDIUM)?;
888890
write(cx.dst.join("FiraSans-LICENSE.txt"), static_files::fira_sans::LICENSE)?;
Binary file not shown.
Binary file not shown.

src/librustdoc/html/static/rustdoc.css

+6-2
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,17 @@
33
font-family: 'Fira Sans';
44
font-style: normal;
55
font-weight: 400;
6-
src: local('Fira Sans'), url("FiraSans-Regular.woff") format('woff');
6+
src: local('Fira Sans'),
7+
url("FiraSans-Regular.woff2") format("woff2"),
8+
url("FiraSans-Regular.woff") format('woff');
79
}
810
@font-face {
911
font-family: 'Fira Sans';
1012
font-style: normal;
1113
font-weight: 500;
12-
src: local('Fira Sans Medium'), url("FiraSans-Medium.woff") format('woff');
14+
src: local('Fira Sans Medium'),
15+
url("FiraSans-Medium.woff2") format("woff2"),
16+
url("FiraSans-Medium.woff") format('woff');
1317
}
1418

1519
/* See SourceSerifPro-LICENSE.txt for the Source Serif Pro license. */

src/librustdoc/html/static_files.rs

+6
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,15 @@ crate mod fira_sans {
7676
/// The file `FiraSans-Regular.woff`, the Regular variant of the Fira Sans font.
7777
crate static REGULAR: &[u8] = include_bytes!("static/FiraSans-Regular.woff");
7878

79+
/// The file `FiraSans-Regular.woff2`, the Regular variant of the Fira Sans font in woff2.
80+
crate static REGULAR2: &[u8] = include_bytes!("static/FiraSans-Regular.woff2");
81+
7982
/// The file `FiraSans-Medium.woff`, the Medium variant of the Fira Sans font.
8083
crate static MEDIUM: &[u8] = include_bytes!("static/FiraSans-Medium.woff");
8184

85+
/// The file `FiraSans-Medium.woff2`, the Medium variant of the Fira Sans font in woff2.
86+
crate static MEDIUM2: &[u8] = include_bytes!("static/FiraSans-Medium.woff2");
87+
8288
/// The file `FiraSans-LICENSE.txt`, the license text for the Fira Sans font.
8389
crate static LICENSE: &[u8] = include_bytes!("static/FiraSans-LICENSE.txt");
8490
}

0 commit comments

Comments
 (0)