diff options
| author | bors <bors@rust-lang.org> | 2021-05-26 07:10:44 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-05-26 07:10:44 +0000 |
| commit | 1969c2e312303faa458cf19dad9783165e3c72c8 (patch) | |
| tree | 1f31c97a13f474a8f383e86360a1b8d2aa3468b4 /src/librustdoc/html/render/write_shared.rs | |
| parent | 54bdfa125722c9ee6fadb61818f861b1102fd300 (diff) | |
| parent | 7c0677ad9b2843eec8ad5330ac7cf29935ec3a22 (diff) | |
Auto merge of #85711 - JohnTitor:rollup-8why04t, r=JohnTitor
Rollup of 12 pull requests
Successful merges:
- #84048 (Avoid CJK legacy fonts in Windows)
- #85529 (doc: clarify Mutex::try_lock, etc. errors)
- #85590 (Fix bootstrap using host exe suffix for cargo)
- #85610 (Fix pointer provenance in <[T]>::copy_within)
- #85623 (Remove stray .stderr files)
- #85645 (Demote `ControlFlow::{from|into}_try` to `pub(crate)`)
- #85647 (Revert "Move llvm submodule updates to rustbuild")
- #85666 (Document shared_from_cow functions)
- #85668 (Fix tasklist example in rustdoc book.)
- #85672 (Move stability attribute for items under the `ip` feature)
- #85699 (Update books)
- #85701 (Update cargo)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'src/librustdoc/html/render/write_shared.rs')
| -rw-r--r-- | src/librustdoc/html/render/write_shared.rs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/librustdoc/html/render/write_shared.rs b/src/librustdoc/html/render/write_shared.rs index bd781e7b741..dd0fb3a9e02 100644 --- a/src/librustdoc/html/render/write_shared.rs +++ b/src/librustdoc/html/render/write_shared.rs @@ -33,6 +33,8 @@ crate static FILES_UNVERSIONED: Lazy<FxHashMap<&str, &[u8]>> = Lazy::new(|| { "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, + "noto-sans-kr-v13-korean-regular.woff" => static_files::noto_sans_kr::REGULAR, + "noto-sans-kr-v13-korean-regular-LICENSE.txt" => static_files::noto_sans_kr::LICENSE, "LICENSE-MIT.txt" => static_files::LICENSE_MIT, "LICENSE-APACHE.txt" => static_files::LICENSE_APACHE, "COPYRIGHT.txt" => static_files::COPYRIGHT, |