mirror of
https://github.com/rust-lang/rust.git
synced 2026-05-29 12:36:35 +03:00
Rollup merge of #41572 - frewsxcv:bump-mdbook, r=steveklabnik
Bump mdbook dep to pick up new 'create missing' toggle feature. This will avoid obscure Travis CI error messages: * https://github.com/rust-lang/rust/pull/40290#issuecomment-294137045 Original mdbook issue: * https://github.com/azerupi/mdBook/issues/253 mdbook PR: * https://github.com/azerupi/mdBook/pull/254
This commit is contained in:
@@ -8,5 +8,5 @@ license = "MIT/Apache-2.0"
|
||||
clap = "2.19.3"
|
||||
|
||||
[dependencies.mdbook]
|
||||
version = "0.0.19"
|
||||
version = "0.0.21"
|
||||
default-features = false
|
||||
|
||||
@@ -53,8 +53,7 @@ fn main() {
|
||||
|
||||
// Build command implementation
|
||||
fn build(args: &ArgMatches) -> Result<(), Box<Error>> {
|
||||
let book_dir = get_book_dir(args);
|
||||
let book = MDBook::new(&book_dir).read_config();
|
||||
let book = build_mdbook_struct(args);
|
||||
|
||||
let mut book = match args.value_of("dest-dir") {
|
||||
Some(dest_dir) => book.set_dest(Path::new(dest_dir)),
|
||||
@@ -67,14 +66,26 @@ fn build(args: &ArgMatches) -> Result<(), Box<Error>> {
|
||||
}
|
||||
|
||||
fn test(args: &ArgMatches) -> Result<(), Box<Error>> {
|
||||
let book_dir = get_book_dir(args);
|
||||
let mut book = MDBook::new(&book_dir).read_config();
|
||||
let mut book = build_mdbook_struct(args);
|
||||
|
||||
try!(book.test());
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn build_mdbook_struct(args: &ArgMatches) -> mdbook::MDBook {
|
||||
let book_dir = get_book_dir(args);
|
||||
let mut book = MDBook::new(&book_dir).read_config();
|
||||
|
||||
// By default mdbook will attempt to create non-existent files referenced
|
||||
// from SUMMARY.md files. This is problematic on CI where we mount the
|
||||
// source directory as readonly. To avoid any issues, we'll disabled
|
||||
// mdbook's implicit file creation feature.
|
||||
book.create_missing = false;
|
||||
|
||||
book
|
||||
}
|
||||
|
||||
fn get_book_dir(args: &ArgMatches) -> PathBuf {
|
||||
if let Some(dir) = args.value_of("dir") {
|
||||
// Check if path is relative from current dir, or absolute...
|
||||
|
||||
Reference in New Issue
Block a user