diff options
| author | bors <bors@rust-lang.org> | 2020-06-27 20:14:34 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-06-27 20:14:34 +0000 |
| commit | 9bdd2db3a60176012f4dc240eea02d615cc60061 (patch) | |
| tree | b2eadafef441ddb5e9771d31ea3d18715251d0e7 /src/bootstrap | |
| parent | 394e1b40d264aa6928811919c1124fa248e7d802 (diff) | |
| parent | 6bcbc426c9abd97ad5379215545349e71592f90b (diff) | |
Auto merge of #73671 - ehuss:update-mdbook, r=Mark-Simulacrum
Update mdbook This updates mdbook to 0.4. The list of changes can be found at https://github.com/rust-lang/mdBook/blob/master/CHANGELOG.md#mdbook-040. I think the most important one is the change to include fonts with the book instead of using the Google Fonts CDN. This adds a few megabytes of fonts to the docs component. It may be possible to share the fonts across the books, but would take a fair bit of work to make that happen, so I'm not sure if it is necessary. This also removes mdbook-linkcheck. It is currently not being used, and I don't foresee it going back into use anytime soon. I would prefer not to maintain something that isn't being used, and it removes a very large number of dependencies.
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/tool.rs | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/src/bootstrap/tool.rs b/src/bootstrap/tool.rs index 0055dee6092..063fb8fbb95 100644 --- a/src/bootstrap/tool.rs +++ b/src/bootstrap/tool.rs @@ -12,7 +12,7 @@ use crate::channel; use crate::channel::GitInfo; use crate::compile; use crate::toolstate::ToolState; -use crate::util::{add_dylib_path, exe, CiEnv}; +use crate::util::{add_dylib_path, exe}; use crate::Compiler; use crate::Mode; @@ -236,7 +236,6 @@ pub fn prepare_tool_cargo( || path.ends_with("rls") || path.ends_with("clippy") || path.ends_with("miri") - || path.ends_with("rustbook") || path.ends_with("rustfmt") { cargo.env("LIBZ_SYS_STATIC", "1"); @@ -272,20 +271,6 @@ pub fn prepare_tool_cargo( cargo } -fn rustbook_features() -> Vec<String> { - let mut features = Vec::new(); - - // Due to CI budged and risk of spurious failures we want to limit jobs running this check. - // At same time local builds should run it regardless of the platform. - // `CiEnv::None` means it's local build and `CHECK_LINKS` is defined in x86_64-gnu-tools to - // explicitly enable it on single job - if CiEnv::current() == CiEnv::None || env::var("CHECK_LINKS").is_ok() { - features.push("linkcheck".to_string()); - } - - features -} - macro_rules! bootstrap_tool { ($( $name:ident, $path:expr, $tool_name:expr @@ -368,7 +353,7 @@ macro_rules! bootstrap_tool { } bootstrap_tool!( - Rustbook, "src/tools/rustbook", "rustbook", features = rustbook_features(); + Rustbook, "src/tools/rustbook", "rustbook"; UnstableBookGen, "src/tools/unstable-book-gen", "unstable-book-gen"; Tidy, "src/tools/tidy", "tidy"; Linkchecker, "src/tools/linkchecker", "linkchecker"; |
