Skip to content

rustdoc: update Source Serif 4 from 4.004 to 4.005#107354

Merged
bors merged 2 commits intorust-lang:masterfrom
tspiteri:source-serif-4.005
Feb 1, 2023
Merged

rustdoc: update Source Serif 4 from 4.004 to 4.005#107354
bors merged 2 commits intorust-lang:masterfrom
tspiteri:source-serif-4.005

Conversation

@tspiteri
Copy link
Contributor

@tspiteri tspiteri commented Jan 27, 2023

Version 4.005 was released on 2023-01-20.

@rustbot
Copy link
Collaborator

rustbot commented Jan 27, 2023

r? @jsha

(rustbot has picked a reviewer for you, use r? to override)

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. labels Jan 27, 2023
@rustbot
Copy link
Collaborator

rustbot commented Jan 27, 2023

Some changes occurred in HTML/CSS/JS.

cc @GuillaumeGomez, @Folyd, @jsha

@tspiteri
Copy link
Contributor Author

tspiteri commented Jan 27, 2023

The updated LICENSE.md has a trailing space in a line, but I did not want to touch the license file (apart from renaming it to SourceSerif4-LICENSE.md).

@GuillaumeGomez
Copy link
Member

GuillaumeGomez commented Jan 27, 2023

You also need to update the file hash in rustdoc.css.

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@tspiteri
rustdoc: update Source Serif 4 from 4.004 to 4.005
167fbbc 
Version 4.005 was released on 2023-01-20.
@tspiteri
Copy link
Contributor Author

tspiteri commented Jan 27, 2023

The updated LICENSE.md has a trailing space in a line, but I did not want to touch the license file (apart from renaming it to SourceSerif4-LICENSE.md).

I had to remove the trailing space as it would make tidy fail. Removing a trailing space from the license file is harmless anyway.

@tspiteri
Copy link
Contributor Author

tspiteri commented Jan 27, 2023 •
edited
Loading

You also need to update the file hash in rustdoc.css.

This is because of #101702 I guess. I think I found this a bit harder than it should be, as I have no idea how the hash is generated; in the end I had to ./x.py test and search for the files with the added hash.

@GuillaumeGomez
Copy link
Member

GuillaumeGomez commented Jan 27, 2023

Don't hesitate to add a comment in the CSS file to explain how to generate it.

@tspiteri
Copy link
Contributor Author

tspiteri commented Jan 27, 2023 •
edited
Loading

The best I could do is something like the following. Is this fine, or is there a better way?

/* When static files are updated, their suffixes need to be updated.
	1. In the top directory run:
		./x.py doc --stage 1 library/core
	2. Find the directory containing files named with updated suffixes:
		find build -path '*'/stage1-std/'*'/static.files
	3. Copy the filenames with updated suffixes from the directory.
*/

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@GuillaumeGomez
Copy link
Member

GuillaumeGomez commented Jan 27, 2023

Actually we already have an explanation for it in src/librustdoc/html/static/scrape-examples-help.md. Maybe mention it instead?

@tspiteri
Copy link
Contributor Author

tspiteri commented Jan 27, 2023

I didn't find anything about the hash suffixes in scrape-examples-help.md.

@GuillaumeGomez
Copy link
Member

GuillaumeGomez commented Jan 27, 2023

Then let's update it. :D

@GuillaumeGomez
Copy link
Member

GuillaumeGomez commented Jan 31, 2023

I'll send the update myself. Thanks for working on this already!

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Jan 31, 2023

📌 Commit 1c3fc9d has been approved by GuillaumeGomez

It is now in the queue for this repository.

@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 Jan 31, 2023
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Jan 31, 2023
@GuillaumeGomez
Rollup merge of rust-lang#107354 - tspiteri:source-serif-4.005, r=Gui…
c5092cd 
…llaumeGomez

rustdoc: update Source Serif 4 from 4.004 to 4.005

[Version 4.005](https://github.com/adobe-fonts/source-serif/releases/tag/4.005R) was released on 2023-01-20.
@GuillaumeGomez GuillaumeGomez mentioned this pull request Jan 31, 2023
Closed
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Jan 31, 2023
@GuillaumeGomez
Rollup merge of rust-lang#107354 - tspiteri:source-serif-4.005, r=Gui…
63ec4dc 
…llaumeGomez

rustdoc: update Source Serif 4 from 4.004 to 4.005

[Version 4.005](https://github.com/adobe-fonts/source-serif/releases/tag/4.005R) was released on 2023-01-20.
@GuillaumeGomez GuillaumeGomez mentioned this pull request Jan 31, 2023
Closed
@GuillaumeGomez
Copy link
Member

GuillaumeGomez commented Jan 31, 2023

I just realized that the file I mentioned have nothing to do with that. Sorry about the confusion.

@GuillaumeGomez GuillaumeGomez mentioned this pull request Jan 31, 2023
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 1, 2023
@bors
Auto merge of rust-lang#107536 - GuillaumeGomez:rollup-xv7dx2h, r=Gui…
ad8e1dc 
…llaumeGomez

Rollup of 12 pull requests

Successful merges:

 - rust-lang#106898 (Include both md and yaml ICE ticket templates)
 - rust-lang#107331 (Clean up eslint annotations and remove unused JS function)
 - rust-lang#107348 (small refactor to new projection code)
 - rust-lang#107354 (rustdoc: update Source Serif 4 from 4.004 to 4.005)
 - rust-lang#107412 (avoid needless checks)
 - rust-lang#107467 (Improve enum checks)
 - rust-lang#107486 (Track bound types like bound regions)
 - rust-lang#107491 (rustdoc: remove unused CSS from `.setting-check`)
 - rust-lang#107508 (`Edition` micro refactor)
 - rust-lang#107525 (PointeeInfo is advisory only)
 - rust-lang#107527 (rustdoc: stop making unstable items transparent)
 - rust-lang#107535 (Replace unwrap with ? in TcpListener doc)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 233b319 into rust-lang:master Feb 1, 2023
@rustbot rustbot added this to the 1.69.0 milestone Feb 1, 2023
@GuillaumeGomez GuillaumeGomez mentioned this pull request Feb 1, 2023
Closed
@tspiteri tspiteri deleted the source-serif-4.005 branch February 20, 2023 15:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@jsha jsha

Labels

S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.69.0

Development

Successfully merging this pull request may close these issues.

6 participants

@tspiteri @rustbot @GuillaumeGomez @rust-log-analyzer @bors @jsha