diff options
| author | bors <bors@rust-lang.org> | 2019-02-05 01:40:13 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-02-05 01:40:13 +0000 |
| commit | 710ddc151baf9750e074229b8bdc794d63246eb8 (patch) | |
| tree | 27d7258442d57270077c9e018e11bf5bc3862bf5 /src/bootstrap | |
| parent | 8ae730a442cc8af6a487a137ae9ba78f89edbba6 (diff) | |
| parent | 4633cca157d9730d75e3fc6144ae952b76f5559f (diff) | |
| download | rust-710ddc151baf9750e074229b8bdc794d63246eb8.tar.gz rust-710ddc151baf9750e074229b8bdc794d63246eb8.zip | |
Auto merge of #56291 - jamesmunns:upstream-embedded-book, r=steveklabnik
Initial addition of the Embedded Rust Book This PR adds the Embedded Rust Book to the bookshelf as a submodule, and adds text for the bookshelf page. I have added a new section after "Master Rust" called "Specialize Rust", with the plan that future domain WG books can also reside here. This now extends the titles down to H3, where formerly only H1 and H2 were used. The added submodule tracks the master branch of the Embedded WG repo. If there are additional steps necessary to make this work in CI (perhaps adding this to `src/ci/docker/x86_64-gnu-tools/checktools.sh:32` or so?), please let me know. CC @steveklabnik @japaric Also CC issue https://github.com/rust-embedded/wg/issues/257
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/builder.rs | 1 | ||||
| -rw-r--r-- | src/bootstrap/doc.rs | 5 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs index 716774632a0..b0d15e6a5df 100644 --- a/src/bootstrap/builder.rs +++ b/src/bootstrap/builder.rs @@ -430,6 +430,7 @@ impl<'a> Builder<'a> { doc::RustByExample, doc::RustcBook, doc::CargoBook, + doc::EmbeddedBook, doc::EditionGuide, ), Kind::Dist => describe!( diff --git a/src/bootstrap/doc.rs b/src/bootstrap/doc.rs index 08e97396fd6..f1d8fca71cd 100644 --- a/src/bootstrap/doc.rs +++ b/src/bootstrap/doc.rs @@ -61,6 +61,7 @@ macro_rules! book { // adding a build step in `src/bootstrap/builder.rs`! book!( EditionGuide, "src/doc/edition-guide", "edition-guide", RustbookVersion::MdBook1; + EmbeddedBook, "src/doc/embedded-book", "embedded-book", RustbookVersion::MdBook2; Nomicon, "src/doc/nomicon", "nomicon", RustbookVersion::MdBook1; Reference, "src/doc/reference", "reference", RustbookVersion::MdBook1; RustByExample, "src/doc/rust-by-example", "rust-by-example", RustbookVersion::MdBook1; @@ -71,10 +72,6 @@ book!( #[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)] enum RustbookVersion { MdBook1, - - /// Note: Currently no books use mdBook v2, but we want the option - /// to be available - #[allow(dead_code)] MdBook2, } |