Skip to content

Commit ddc4284

Browse files
authored
Rollup merge of rust-lang#47753 - steveklabnik:update-book, r=alexcrichton
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.
2 parents a405a08 + 983cc00 commit ddc4284

File tree

6 files changed

+57
-12
lines changed

6 files changed

+57
-12
lines changed

src/Cargo.lock

+45-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/doc/book

Submodule book updated 122 files

src/doc/reference

src/tools/rustbook/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ license = "MIT/Apache-2.0"
88
clap = "2.25.0"
99

1010
[dependencies.mdbook]
11-
version = "0.0.28"
11+
version = "0.1.2"
1212
default-features = false

src/tools/rustbook/src/main.rs

+7-3
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ extern crate mdbook;
1313
extern crate clap;
1414

1515
use std::env;
16-
use std::io::{self, Write};
1716
use std::path::{Path, PathBuf};
1817

1918
use clap::{App, ArgMatches, SubCommand, AppSettings};
@@ -45,14 +44,19 @@ fn main() {
4544
};
4645

4746
if let Err(e) = res {
48-
writeln!(&mut io::stderr(), "An error occured:\n{}", e).ok();
47+
eprintln!("Error: {}", e);
48+
49+
for cause in e.iter().skip(1) {
50+
eprintln!("\tCaused By: {}", cause);
51+
}
52+
4953
::std::process::exit(101);
5054
}
5155
}
5256
// Build command implementation
5357
pub fn build(args: &ArgMatches) -> Result<()> {
5458
let book_dir = get_book_dir(args);
55-
let mut book = MDBook::new(&book_dir).read_config()?;
59+
let mut book = MDBook::load(&book_dir)?;
5660

5761
// Set this to allow us to catch bugs in advance.
5862
book.config.build.create_missing = false;

src/tools/tidy/src/deps.rs

+2
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ static EXCEPTIONS: &'static [&'static str] = &[
3333
"openssl", // BSD+advertising clause, cargo, mdbook
3434
"pest", // MPL2, mdbook via handlebars
3535
"thread-id", // Apache-2.0, mdbook
36+
"toml-query", // MPL-2.0, mdbook
37+
"is-match", // MPL-2.0, mdbook
3638
"cssparser", // MPL-2.0, rustdoc
3739
"smallvec", // MPL-2.0, rustdoc
3840
"fuchsia-zircon-sys", // BSD-3-Clause, rustdoc, rustc, cargo

0 commit comments

Comments
 (0)