Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update fonts used by rustdoc #60146

Merged
merged 3 commits into from Apr 23, 2019

Conversation

Projects
None yet
6 participants
@Manishearth
Copy link
Member

commented Apr 21, 2019

Our version of Source Serif Pro is pretty old and is causing issues on Linux, see https://bugzilla.mozilla.org/show_bug.cgi?id=1545317 . I took this opportunity to update all of the fonts we use.

r? @steveklabnik @QuietMisdreavus

@Manishearth

This comment has been minimized.

Copy link
Member Author

commented Apr 21, 2019

An example of how it's broken (look at the quotes):

image

@Manishearth

This comment has been minimized.

Copy link
Member Author

commented Apr 21, 2019

With the new fonts, on a test page:

image

@rust-highfive

This comment has been minimized.

Copy link
Collaborator

commented Apr 21, 2019

The job x86_64-gnu-llvm-6.0 of your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.
travis_time:end:01b338aa:start=1555814615557146478,finish=1555814616473687350,duration=916540872
$ git checkout -qf FETCH_HEAD
travis_fold:end:git.checkout

Encrypted environment variables have been removed for security reasons.
See https://docs.travis-ci.com/user/pull-requests/#pull-requests-and-security-restrictions
$ export SCCACHE_BUCKET=rust-lang-ci-sccache2
$ export SCCACHE_REGION=us-west-1
$ export GCP_CACHE_BUCKET=rust-lang-ci-cache
$ export AWS_ACCESS_KEY_ID=AKIA46X5W6CZEJZ6XT55
---
[00:49:38]    Compiling parking_lot_core v0.4.0
[00:49:43]    Compiling tempfile v3.0.5
[00:49:44]    Compiling parking_lot v0.7.1
[00:49:45]    Compiling rustdoc v0.0.0 (/checkout/src/librustdoc)
[00:49:46] error: couldn't read src/librustdoc/html/static/SourceSerifPro-LICENSE.txt: No such file or directory (os error 2)
[00:49:46]   --> src/librustdoc/html/static_files.rs:94:41
[00:49:46]    |
[00:49:46] 94 |     pub static LICENSE: &'static [u8] = include_bytes!("static/SourceSerifPro-LICENSE.txt");
[00:49:46] 
[00:49:46] error: couldn't read src/librustdoc/html/static/SourceCodePro-LICENSE.txt: No such file or directory (os error 2)
[00:49:46]    --> src/librustdoc/html/static_files.rs:106:41
[00:49:46]     |
[00:49:46]     |
[00:49:46] 106 |     pub static LICENSE: &'static [u8] = include_bytes!("static/SourceCodePro-LICENSE.txt");
[00:49:46] 
[00:49:51] error: aborting due to 2 previous errors
[00:49:51] 
[00:49:51] error: Could not compile `rustdoc`.
---
travis_time:end:0392e740:start=1555817619372226400,finish=1555817619376985690,duration=4759290
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:21781a11
$ ln -s . checkout && for CORE in obj/cores/core.*; do EXE=$(echo $CORE | sed 's|obj/cores/core\.[0-9]*\.!checkout!\(.*\)|\1|;y|!|/|'); if [ -f "$EXE" ]; then printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" "$CORE"; gdb --batch -q -c "$CORE" "$EXE" -iex 'set auto-load off' -iex 'dir src/' -iex 'set sysroot .' -ex bt -ex q; echo travis_fold":"end:crashlog; fi; done || true
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:115b2bc8
$ cat ./obj/build/x86_64-unkno

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

@Manishearth Manishearth force-pushed the Manishearth:font-update branch from fa6a4fa to cdca41d Apr 21, 2019

@@ -24,7 +19,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,

This comment has been minimized.

Copy link
@fbstj

fbstj Apr 21, 2019

Contributor

is the "random" trailing space to keep it inline with the original for some reason?

@Manishearth

This comment has been minimized.

Copy link
Member Author

commented Apr 21, 2019

@QuietMisdreavus

This comment has been minimized.

Copy link
Member

commented Apr 22, 2019

Something i wonder is whether this will affect docs.rs: Since we don't apply the resource suffix to the font files, docs.rs serves them directly (e.g. https://docs.rs/SourceSerifPro-Regular.ttf.woff). The updated files here are a drop-in upgrade of the fonts, right? So even if they start getting served for older docs, it won't degrade anything? (OTOH, i don't think it will actually serve them for a while, since the CDN will have cached the existing files.)

@Manishearth

This comment has been minimized.

Copy link
Member Author

commented Apr 22, 2019

Yeah they're drop in upgrades. Shouldn't degrade anything.

@QuietMisdreavus
Copy link
Member

left a comment

This looks good, thanks!

@QuietMisdreavus

This comment has been minimized.

Copy link
Member

commented Apr 22, 2019

@bors r+ rollup

@bors

This comment has been minimized.

Copy link
Contributor

commented Apr 22, 2019

📌 Commit cdca41d has been approved by QuietMisdreavus

kennytm added a commit to kennytm/rust that referenced this pull request Apr 23, 2019

Rollup merge of rust-lang#60146 - Manishearth:font-update, r=QuietMis…
…dreavus

Update fonts used by rustdoc

Our version of Source Serif Pro is pretty old and is causing issues on Linux, see https://bugzilla.mozilla.org/show_bug.cgi?id=1545317 . I took this opportunity to update all of the fonts we use.

r? @steveklabnik @QuietMisdreavus

bors added a commit that referenced this pull request Apr 23, 2019

Auto merge of #60189 - kennytm:rollup-8xgg35r, r=kennytm
Rollup of 6 pull requests

Successful merges:

 - #59839 (Warn on unused results for operation methods on nums)
 - #60146 (Update fonts used by rustdoc)
 - #60169 (Warn when ignore-tidy-linelength is present, but no lines are too long)
 - #60172 (Disallow double trailing newlines in tidy)
 - #60177 (Promote rust comments to rustdoc)
 - #60180 (Update cargo, books)

Failed merges:

r? @ghost

Centril added a commit to Centril/rust that referenced this pull request Apr 23, 2019

Rollup merge of rust-lang#60146 - Manishearth:font-update, r=QuietMis…
…dreavus

Update fonts used by rustdoc

Our version of Source Serif Pro is pretty old and is causing issues on Linux, see https://bugzilla.mozilla.org/show_bug.cgi?id=1545317 . I took this opportunity to update all of the fonts we use.

r? @steveklabnik @QuietMisdreavus

Centril added a commit to Centril/rust that referenced this pull request Apr 23, 2019

Rollup merge of rust-lang#60146 - Manishearth:font-update, r=QuietMis…
…dreavus

Update fonts used by rustdoc

Our version of Source Serif Pro is pretty old and is causing issues on Linux, see https://bugzilla.mozilla.org/show_bug.cgi?id=1545317 . I took this opportunity to update all of the fonts we use.

r? @steveklabnik @QuietMisdreavus

bors added a commit that referenced this pull request Apr 23, 2019

Auto merge of #60208 - Centril:rollup-vg8gl67, r=Centril
Rollup of 6 pull requests

Successful merges:

 - #59739 (Stabilize futures_api)
 - #59839 (Warn on unused results for operation methods on nums)
 - #60146 (Update fonts used by rustdoc)
 - #60169 (Warn when ignore-tidy-linelength is present, but no lines are too long)
 - #60177 (Promote rust comments to rustdoc)
 - #60191 (Add f16c target_feature)

Failed merges:

r? @ghost

Centril added a commit to Centril/rust that referenced this pull request Apr 23, 2019

Rollup merge of rust-lang#60146 - Manishearth:font-update, r=QuietMis…
…dreavus

Update fonts used by rustdoc

Our version of Source Serif Pro is pretty old and is causing issues on Linux, see https://bugzilla.mozilla.org/show_bug.cgi?id=1545317 . I took this opportunity to update all of the fonts we use.

r? @steveklabnik @QuietMisdreavus

Centril added a commit to Centril/rust that referenced this pull request Apr 23, 2019

Rollup merge of rust-lang#60146 - Manishearth:font-update, r=QuietMis…
…dreavus

Update fonts used by rustdoc

Our version of Source Serif Pro is pretty old and is causing issues on Linux, see https://bugzilla.mozilla.org/show_bug.cgi?id=1545317 . I took this opportunity to update all of the fonts we use.

r? @steveklabnik @QuietMisdreavus

bors added a commit that referenced this pull request Apr 23, 2019

Auto merge of #60211 - Centril:rollup-akw4r85, r=Centril
Rollup of 6 pull requests

Successful merges:

 - #59823 ([wg-async-await] Drop `async fn` arguments in async block )
 - #59839 (Warn on unused results for operation methods on nums)
 - #60146 (Update fonts used by rustdoc)
 - #60169 (Warn when ignore-tidy-linelength is present, but no lines are too long)
 - #60177 (Promote rust comments to rustdoc)
 - #60191 (Add f16c target_feature)

Failed merges:

r? @ghost

@bors bors merged commit cdca41d into rust-lang:master Apr 23, 2019

1 check passed

Travis CI - Pull Request Build Passed
Details

Centril added a commit to Centril/rust that referenced this pull request Apr 30, 2019

Rollup merge of rust-lang#60382 - Manishearth:revert-code-font, r=Gui…
…llaumeGomez

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.

Centril added a commit to Centril/rust that referenced this pull request Apr 30, 2019

Rollup merge of rust-lang#60382 - Manishearth:revert-code-font, r=Gui…
…llaumeGomez

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.

Centril added a commit to Centril/rust that referenced this pull request Apr 30, 2019

Rollup merge of rust-lang#60382 - Manishearth:revert-code-font, r=Gui…
…llaumeGomez

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.

Centril added a commit to Centril/rust that referenced this pull request Apr 30, 2019

Rollup merge of rust-lang#60382 - Manishearth:revert-code-font, r=Gui…
…llaumeGomez

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.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.