From: Rust Maintainers Date: Thu, 31 May 2018 16:25:17 +0000 (+0100) Subject: d-no-web-dependencies-in-doc X-Git-Tag: archive/raspbian/1.26.1+dfsg1-3+rpi1^2~1 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=de06fafe45f795630b2ee3459b0981ac2957d6bf;p=rustc.git d-no-web-dependencies-in-doc Gbp-Pq: Name d-no-web-dependencies-in-doc.patch --- diff --git a/src/doc/rust-by-example/theme/index.hbs b/src/doc/rust-by-example/theme/index.hbs index 89dfaaa45b..4f4ff78362 100644 --- a/src/doc/rust-by-example/theme/index.hbs +++ b/src/doc/rust-by-example/theme/index.hbs @@ -10,15 +10,13 @@ - - - + - + @@ -29,27 +27,10 @@ {{#if mathjax_support}} - + {{/if}} - - - - - - - - - - + {{#each additional_js}} @@ -58,20 +39,6 @@ - - - - - - @@ -134,42 +101,9 @@ - - - {{{livereload}}} - {{#if google_analytics}} - - {{/if}} - - {{#if playpens_editable}} - - - - - - {{/if}} - {{#if is_print}} {{/if}} - + diff --git a/src/tools/linkchecker/main.rs b/src/tools/linkchecker/main.rs index 17e336f471..365b46ede2 100644 --- a/src/tools/linkchecker/main.rs +++ b/src/tools/linkchecker/main.rs @@ -180,6 +180,11 @@ fn check(cache: &mut Cache, url.starts_with("irc:") || url.starts_with("data:") { return; } + // Ignore parent URLs, so that the package installation process can + // provide a symbolic link later + if url.starts_with("../") { + return; + } let mut parts = url.splitn(2, "#"); let url = parts.next().unwrap(); let fragment = parts.next(); diff --git a/src/vendor/mdbook/src/book/init.rs b/src/vendor/mdbook/src/book/init.rs index 909b8cbf0b..9f1388e3a9 100644 --- a/src/vendor/mdbook/src/book/init.rs +++ b/src/vendor/mdbook/src/book/init.rs @@ -136,12 +136,6 @@ impl BookBuilder { let mut js = File::create(themedir.join("book.js"))?; js.write_all(theme::JS)?; - let mut highlight_css = File::create(themedir.join("highlight.css"))?; - highlight_css.write_all(theme::HIGHLIGHT_CSS)?; - - let mut highlight_js = File::create(themedir.join("highlight.js"))?; - highlight_js.write_all(theme::HIGHLIGHT_JS)?; - Ok(()) } diff --git a/src/vendor/mdbook/src/renderer/html_handlebars/hbs_renderer.rs b/src/vendor/mdbook/src/renderer/html_handlebars/hbs_renderer.rs index 6535a4a3dd..f994a6b9e8 100644 --- a/src/vendor/mdbook/src/renderer/html_handlebars/hbs_renderer.rs +++ b/src/vendor/mdbook/src/renderer/html_handlebars/hbs_renderer.rs @@ -3,7 +3,7 @@ use renderer::{RenderContext, Renderer}; use book::{Book, BookItem, Chapter}; use config::{Config, HtmlConfig, Playpen}; use {theme, utils}; -use theme::{playpen_editor, Theme}; +use theme::{Theme}; use errors::*; use regex::{Captures, Regex}; @@ -156,62 +156,8 @@ impl HtmlHandlebars { self.write_file(destination, "book.js", &theme.js)?; self.write_file(destination, "book.css", &theme.css)?; self.write_file(destination, "favicon.png", &theme.favicon)?; - self.write_file(destination, "highlight.css", &theme.highlight_css)?; self.write_file(destination, "tomorrow-night.css", &theme.tomorrow_night_css)?; self.write_file(destination, "ayu-highlight.css", &theme.ayu_highlight_css)?; - self.write_file(destination, "highlight.js", &theme.highlight_js)?; - self.write_file(destination, "clipboard.min.js", &theme.clipboard_js)?; - self.write_file( - destination, - "_FontAwesome/css/font-awesome.css", - theme::FONT_AWESOME, - )?; - self.write_file( - destination, - "_FontAwesome/fonts/fontawesome-webfont.eot", - theme::FONT_AWESOME_EOT, - )?; - self.write_file( - destination, - "_FontAwesome/fonts/fontawesome-webfont.svg", - theme::FONT_AWESOME_SVG, - )?; - self.write_file( - destination, - "_FontAwesome/fonts/fontawesome-webfont.ttf", - theme::FONT_AWESOME_TTF, - )?; - self.write_file( - destination, - "_FontAwesome/fonts/fontawesome-webfont.woff", - theme::FONT_AWESOME_WOFF, - )?; - self.write_file( - destination, - "_FontAwesome/fonts/fontawesome-webfont.woff2", - theme::FONT_AWESOME_WOFF2, - )?; - self.write_file( - destination, - "_FontAwesome/fonts/FontAwesome.ttf", - theme::FONT_AWESOME_TTF, - )?; - - let playpen_config = &html_config.playpen; - - // Ace is a very large dependency, so only load it when requested - if playpen_config.editable { - // Load the editor - let editor = playpen_editor::PlaypenEditor::new(&playpen_config.editor); - self.write_file(destination, "editor.js", &editor.js)?; - self.write_file(destination, "ace.js", &editor.ace_js)?; - self.write_file(destination, "mode-rust.js", &editor.mode_rust_js)?; - self.write_file(destination, "theme-dawn.js", &editor.theme_dawn_js)?; - self.write_file(destination, - "theme-tomorrow_night.js", - &editor.theme_tomorrow_night_js, - )?; - } Ok(()) } diff --git a/src/vendor/mdbook/src/theme/index.hbs b/src/vendor/mdbook/src/theme/index.hbs index 2c15f38e19..c4b761a547 100644 --- a/src/vendor/mdbook/src/theme/index.hbs +++ b/src/vendor/mdbook/src/theme/index.hbs @@ -11,15 +11,13 @@ - - - + - + @@ -30,53 +28,12 @@ {{#if mathjax_support}} - + {{/if}} - - - - - - - - - - - -

{{#toc}}{{/toc}} @@ -164,17 +121,6 @@ - - - {{#if livereload}} {{/if}} - {{#if google_analytics}} - - - {{/if}} - {{#if playpens_editable}} - - - - - - {{/if}} {{#if is_print}} {{/if}} - + diff --git a/src/vendor/mdbook/src/theme/mod.rs b/src/vendor/mdbook/src/theme/mod.rs index 0633be3460..fdf5d54675 100644 --- a/src/vendor/mdbook/src/theme/mod.rs +++ b/src/vendor/mdbook/src/theme/mod.rs @@ -1,6 +1,4 @@ #![allow(missing_docs)] // FIXME: Document this -pub mod playpen_editor; - use std::path::Path; use std::fs::File; use std::io::Read; @@ -12,23 +10,8 @@ pub static HEADER: &'static [u8] = include_bytes!("header.hbs"); pub static CSS: &'static [u8] = include_bytes!("book.css"); pub static FAVICON: &'static [u8] = include_bytes!("favicon.png"); pub static JS: &'static [u8] = include_bytes!("book.js"); -pub static HIGHLIGHT_JS: &'static [u8] = include_bytes!("highlight.js"); pub static TOMORROW_NIGHT_CSS: &'static [u8] = include_bytes!("tomorrow-night.css"); -pub static HIGHLIGHT_CSS: &'static [u8] = include_bytes!("highlight.css"); pub static AYU_HIGHLIGHT_CSS: &'static [u8] = include_bytes!("ayu-highlight.css"); -pub static CLIPBOARD_JS: &'static [u8] = include_bytes!("clipboard.min.js"); -pub static FONT_AWESOME: &'static [u8] = include_bytes!("_FontAwesome/css/font-awesome.min.css"); -pub static FONT_AWESOME_EOT: &'static [u8] = - include_bytes!("_FontAwesome/fonts/fontawesome-webfont.eot"); -pub static FONT_AWESOME_SVG: &'static [u8] = - include_bytes!("_FontAwesome/fonts/fontawesome-webfont.svg"); -pub static FONT_AWESOME_TTF: &'static [u8] = - include_bytes!("_FontAwesome/fonts/fontawesome-webfont.ttf"); -pub static FONT_AWESOME_WOFF: &'static [u8] = - include_bytes!("_FontAwesome/fonts/fontawesome-webfont.woff"); -pub static FONT_AWESOME_WOFF2: &'static [u8] = - include_bytes!("_FontAwesome/fonts/fontawesome-webfont.woff2"); -pub static FONT_AWESOME_OTF: &'static [u8] = include_bytes!("_FontAwesome/fonts/FontAwesome.otf"); /// The `Theme` struct should be used instead of the static variables because @@ -44,11 +27,8 @@ pub struct Theme { pub css: Vec, pub favicon: Vec, pub js: Vec, - pub highlight_css: Vec, pub tomorrow_night_css: Vec, pub ayu_highlight_css: Vec, - pub highlight_js: Vec, - pub clipboard_js: Vec, } impl Theme { @@ -69,9 +49,6 @@ impl Theme { (theme_dir.join("book.js"), &mut theme.js), (theme_dir.join("book.css"), &mut theme.css), (theme_dir.join("favicon.png"), &mut theme.favicon), - (theme_dir.join("highlight.js"), &mut theme.highlight_js), - (theme_dir.join("clipboard.min.js"), &mut theme.clipboard_js), - (theme_dir.join("highlight.css"), &mut theme.highlight_css), (theme_dir.join("tomorrow-night.css"), &mut theme.tomorrow_night_css), (theme_dir.join("ayu-highlight.css"), &mut theme.ayu_highlight_css), ]; @@ -99,11 +76,8 @@ impl Default for Theme { css: CSS.to_owned(), favicon: FAVICON.to_owned(), js: JS.to_owned(), - highlight_css: HIGHLIGHT_CSS.to_owned(), tomorrow_night_css: TOMORROW_NIGHT_CSS.to_owned(), ayu_highlight_css: AYU_HIGHLIGHT_CSS.to_owned(), - highlight_js: HIGHLIGHT_JS.to_owned(), - clipboard_js: CLIPBOARD_JS.to_owned(), } } } @@ -169,11 +143,8 @@ mod tests { css: Vec::new(), favicon: Vec::new(), js: Vec::new(), - highlight_css: Vec::new(), tomorrow_night_css: Vec::new(), ayu_highlight_css: Vec::new(), - highlight_js: Vec::new(), - clipboard_js: Vec::new(), }; assert_eq!(got, empty);