Skip to content

Rollup of 7 pull requests #83398

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

Merged
merged 28 commits into from
Mar 23, 2021
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
0cefbc5
Update RELEASES.md for 1.51.0
XAMPPRocky Feb 9, 2021
cc5667a
Update RELEASES.md
XAMPPRocky Feb 9, 2021
8dbbe78
Apply suggestions from code review
XAMPPRocky Feb 9, 2021
cecb8a6
Update RELEASES.md
XAMPPRocky Feb 9, 2021
8e24a97
Update RELEASES.md
XAMPPRocky Feb 11, 2021
35ea03b
Apply suggestions from code review
XAMPPRocky Feb 11, 2021
69e56ad
Update RELEASES.md
XAMPPRocky Feb 13, 2021
0b0fd78
Update RELEASES.md
XAMPPRocky Feb 22, 2021
68f76ce
Update RELEASES.md
XAMPPRocky Feb 22, 2021
b1182d2
Update RELEASES.md
XAMPPRocky Mar 3, 2021
c7d9cda
Update RELEASES.md
XAMPPRocky Mar 4, 2021
3ab4f9a
Remove theme.js file creation and move its code inside main.js
GuillaumeGomez Mar 5, 2021
5dea1f1
Clean up code around theme elements
GuillaumeGomez Mar 5, 2021
524fdf0
Use global variables instead of functions for DOM IDs
GuillaumeGomez Mar 5, 2021
87d17bb
Update Source Code Pro and include italics
tspiteri Mar 4, 2021
c64e796
Update RELEASES.md
XAMPPRocky Mar 15, 2021
f820fd2
rustdoc: Replace pair of `Option`s with an enum
camelid Mar 21, 2021
8c4b3db
rename :pat2018 -> :pat215
mark-i-m Mar 22, 2021
0717326
:arrow_up: rust-analyzer
lnicola Mar 22, 2021
d3c7494
add key rustc_private for package metadata for rust-analyzer in libru…
njasm Mar 22, 2021
34635ec
missing newline at eof
njasm Mar 22, 2021
0e96c62
Rollup merge of #80705 - tspiteri:italic-and-update-SourceCodePro, r=…
JohnTitor Mar 23, 2021
9cae1fb
Rollup merge of #81917 - rust-lang:relnotes-1.51.0, r=Mark-Simulacrum
JohnTitor Mar 23, 2021
a34cc6b
Rollup merge of #82732 - GuillaumeGomez:remove-theme-file, r=Nemo157
JohnTitor Mar 23, 2021
20006b1
Rollup merge of #83356 - camelid:rustdoc-option-to-enum, r=GuillaumeG…
JohnTitor Mar 23, 2021
50d048f
Rollup merge of #83384 - mark-i-m:rename-pat2018, r=joshtriplett
JohnTitor Mar 23, 2021
2e14c1d
Rollup merge of #83385 - lnicola:rust-analyzer-2021-03-22, r=jonas-sc…
JohnTitor Mar 23, 2021
263c858
Rollup merge of #83389 - njasm:test_rustdoc, r=jyn514
JohnTitor Mar 23, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update Source Code Pro and include italics
  • Loading branch information
tspiteri committed Mar 7, 2021
commit 87d17bb9e8f69b1e7c4a7997f943253db1dda636
5 changes: 3 additions & 2 deletions src/librustdoc/html/render/write_shared.rs
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,9 @@ crate static FILES_UNVERSIONED: Lazy<FxHashMap<&str, &[u8]>> = Lazy::new(|| {
"SourceSerifPro-Bold.ttf.woff" => static_files::source_serif_pro::BOLD,
"SourceSerifPro-It.ttf.woff" => static_files::source_serif_pro::ITALIC,
"SourceSerifPro-LICENSE.md" => static_files::source_serif_pro::LICENSE,
"SourceCodePro-Regular.woff" => static_files::source_code_pro::REGULAR,
"SourceCodePro-Semibold.woff" => static_files::source_code_pro::SEMIBOLD,
"SourceCodePro-Regular.ttf.woff" => static_files::source_code_pro::REGULAR,
"SourceCodePro-Semibold.ttf.woff" => static_files::source_code_pro::SEMIBOLD,
"SourceCodePro-It.ttf.woff" => static_files::source_code_pro::ITALIC,
"SourceCodePro-LICENSE.txt" => static_files::source_code_pro::LICENSE,
"LICENSE-MIT.txt" => static_files::LICENSE_MIT,
"LICENSE-APACHE.txt" => static_files::LICENSE_APACHE,
Expand Down
3 changes: 2 additions & 1 deletion src/librustdoc/html/static/COPYRIGHT.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ included, and carry their own copyright notices and license terms:
Copyright (c) Nicolas Gallagher and Jonathan Neal.
Licensed under the MIT license (see LICENSE-MIT.txt).

* Source Code Pro (SourceCodePro-Regular.woff, SourceCodePro-Semibold.woff):
* Source Code Pro (SourceCodePro-Regular.ttf.woff,
SourceCodePro-Semibold.ttf.woff, SourceCodePro-It.ttf.woff):

Copyright 2010, 2012 Adobe Systems Incorporated (http://www.adobe.com/),
with Reserved Font Name 'Source'. All Rights Reserved. Source is a trademark
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
11 changes: 9 additions & 2 deletions src/librustdoc/html/static/rustdoc.css
Original file line number Diff line number Diff line change
Expand Up @@ -48,14 +48,21 @@
font-weight: 400;
/* Avoid using locally installed font because bad versions are in circulation:
* see https://github.com/rust-lang/rust/issues/24355 */
src: url("SourceCodePro-Regular.woff") format('woff');
src: url("SourceCodePro-Regular.ttf.woff") format('woff');
font-display: swap;
}
@font-face {
font-family: 'Source Code Pro';
font-style: italic;
font-weight: 400;
src: url("SourceCodePro-It.ttf.woff") format('woff');
font-display: swap;
}
@font-face {
font-family: 'Source Code Pro';
font-style: normal;
font-weight: 600;
src: url("SourceCodePro-Semibold.woff") format('woff');
src: url("SourceCodePro-Semibold.ttf.woff") format('woff');
font-display: swap;
}

Expand Down
12 changes: 8 additions & 4 deletions src/librustdoc/html/static_files.rs
Original file line number Diff line number Diff line change
Expand Up @@ -107,11 +107,15 @@ crate mod source_serif_pro {

/// Files related to the Source Code Pro font.
crate mod source_code_pro {
/// The file `SourceCodePro-Regular.woff`, the Regular variant of the Source Code Pro font.
crate static REGULAR: &[u8] = include_bytes!("static/SourceCodePro-Regular.woff");
/// The file `SourceCodePro-Regular.ttf.woff`, the Regular variant of the Source Code Pro font.
crate static REGULAR: &[u8] = include_bytes!("static/SourceCodePro-Regular.ttf.woff");

/// The file `SourceCodePro-Semibold.woff`, the Semibold variant of the Source Code Pro font.
crate static SEMIBOLD: &[u8] = include_bytes!("static/SourceCodePro-Semibold.woff");
/// The file `SourceCodePro-Semibold.ttf.woff`, the Semibold variant of the Source Code Pro
/// font.
crate static SEMIBOLD: &[u8] = include_bytes!("static/SourceCodePro-Semibold.ttf.woff");

/// The file `SourceCodePro-It.ttf.woff`, the Italic variant of the Source Code Pro font.
crate static ITALIC: &[u8] = include_bytes!("static/SourceCodePro-It.ttf.woff");

/// The file `SourceCodePro-LICENSE.txt`, the license text of the Source Code Pro font.
crate static LICENSE: &[u8] = include_bytes!("static/SourceCodePro-LICENSE.txt");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,10 @@ FiraSans-Regular.woff
FiraSans-Regular.woff2
LICENSE-APACHE.txt
LICENSE-MIT.txt
SourceCodePro-It.ttf.woff
SourceCodePro-LICENSE.txt
SourceCodePro-Regular.woff
SourceCodePro-Semibold.woff
SourceCodePro-Regular.ttf.woff
SourceCodePro-Semibold.ttf.woff
SourceSerifPro-Bold.ttf.woff
SourceSerifPro-It.ttf.woff
SourceSerifPro-LICENSE.md
Expand Down