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
Merged

Update fonts used by rustdoc #60146

merged 3 commits into from
Apr 23, 2019

Conversation

Manishearth
Copy link
Member

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

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 21, 2019
@Manishearth
Copy link
Member Author

Manishearth commented Apr 21, 2019

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

image

@Manishearth
Copy link
Member Author

With the new fonts, on a test page:

image

@rust-highfive
Copy link
Collaborator

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)

@@ -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,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

@Manishearth
Copy link
Member Author

Manishearth commented Apr 21, 2019 via email

@QuietMisdreavus
Copy link
Member

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
Copy link
Member Author

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

Copy link
Member

@QuietMisdreavus QuietMisdreavus left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks good, thanks!

@QuietMisdreavus
Copy link
Member

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Apr 22, 2019

📌 Commit cdca41d has been approved by QuietMisdreavus

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Apr 22, 2019
kennytm added a commit to kennytm/rust that referenced this pull request Apr 23, 2019
…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
…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
…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
…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
…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
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
Centril added a commit to Centril/rust that referenced this pull request Apr 30, 2019
…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
…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
…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
…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.
@Manishearth Manishearth deleted the font-update branch July 18, 2020 01:15
@Manishearth Manishearth restored the font-update branch July 18, 2020 01:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants