Skip to content

Commit

Permalink
Rollup merge of rust-lang#47753 - steveklabnik:update-book, r=alexcri…
Browse files Browse the repository at this point in the history
…chton

Update book

This PR does two things:

1. update the book to include rust-lang/book#1088
2. update to mdbook 0.1

Both of these things are big changes, so I want to land them now, well before the next branch, so we can kick the tires.

------------------------------

Locally, I'm seeing some weirdness around the reference and this:

![image](https://user-images.githubusercontent.com/27786/35411917-8dcbb31a-01e8-11e8-8c30-0bd280d93b9d.png)

Putting this PR up so others can try and build and see if it reproduces for them.
  • Loading branch information
kennytm committed Feb 5, 2018
2 parents a405a08 + 983cc00 commit ddc4284
Show file tree
Hide file tree
Showing 6 changed files with 57 additions and 12 deletions.
51 changes: 45 additions & 6 deletions src/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/doc/book
Submodule book updated 122 files
2 changes: 1 addition & 1 deletion src/doc/reference
2 changes: 1 addition & 1 deletion src/tools/rustbook/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ license = "MIT/Apache-2.0"
clap = "2.25.0"

[dependencies.mdbook]
version = "0.0.28"
version = "0.1.2"
default-features = false
10 changes: 7 additions & 3 deletions src/tools/rustbook/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ extern crate mdbook;
extern crate clap;

use std::env;
use std::io::{self, Write};
use std::path::{Path, PathBuf};

use clap::{App, ArgMatches, SubCommand, AppSettings};
Expand Down Expand Up @@ -45,14 +44,19 @@ fn main() {
};

if let Err(e) = res {
writeln!(&mut io::stderr(), "An error occured:\n{}", e).ok();
eprintln!("Error: {}", e);

for cause in e.iter().skip(1) {
eprintln!("\tCaused By: {}", cause);
}

::std::process::exit(101);
}
}
// Build command implementation
pub fn build(args: &ArgMatches) -> Result<()> {
let book_dir = get_book_dir(args);
let mut book = MDBook::new(&book_dir).read_config()?;
let mut book = MDBook::load(&book_dir)?;

// Set this to allow us to catch bugs in advance.
book.config.build.create_missing = false;
Expand Down
2 changes: 2 additions & 0 deletions src/tools/tidy/src/deps.rs
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ static EXCEPTIONS: &'static [&'static str] = &[
"openssl", // BSD+advertising clause, cargo, mdbook
"pest", // MPL2, mdbook via handlebars
"thread-id", // Apache-2.0, mdbook
"toml-query", // MPL-2.0, mdbook
"is-match", // MPL-2.0, mdbook
"cssparser", // MPL-2.0, rustdoc
"smallvec", // MPL-2.0, rustdoc
"fuchsia-zircon-sys", // BSD-3-Clause, rustdoc, rustc, cargo
Expand Down

0 comments on commit ddc4284

Please sign in to comment.