diff options
| author | bors <bors@rust-lang.org> | 2018-01-15 02:02:22 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-01-15 02:02:22 +0000 |
| commit | bb345a0be3ba3fa1970fe02789791c5c72788d8f (patch) | |
| tree | d96db019e909a579a45966d01a6abdd9207ae957 | |
| parent | 3f92e8d89861f0f5408ad9381a7467ec6e7d76bc (diff) | |
| parent | a2df4131871b6d18e1d3d2913d7a4436cd0d0277 (diff) | |
Auto merge of #46196 - projektir:rbe-submodule, r=steveklabnik
Adding RBE as a submodule #46194 Adding RBE as a submodule to start issue #46194.
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rw-r--r-- | src/bootstrap/builder.rs | 2 | ||||
| -rw-r--r-- | src/bootstrap/doc.rs | 3 | ||||
| m--------- | src/doc/rust-by-example | 0 |
4 files changed, 6 insertions, 2 deletions
diff --git a/.gitmodules b/.gitmodules index 373ca90eca1..ffa7b321ba6 100644 --- a/.gitmodules +++ b/.gitmodules @@ -48,3 +48,6 @@ [submodule "src/binaryen"] path = src/binaryen url = https://github.com/alexcrichton/binaryen.git +[submodule "src/doc/rust-by-example"] + path = src/doc/rust-by-example + url = https://github.com/rust-lang/rust-by-example diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs index a660b5cf852..8e35ecc8090 100644 --- a/src/bootstrap/builder.rs +++ b/src/bootstrap/builder.rs @@ -258,7 +258,7 @@ impl<'a> Builder<'a> { Kind::Bench => describe!(check::Crate, check::CrateLibrustc), Kind::Doc => describe!(doc::UnstableBook, doc::UnstableBookGen, doc::TheBook, doc::Standalone, doc::Std, doc::Test, doc::Rustc, doc::ErrorIndex, doc::Nomicon, - doc::Reference, doc::Rustdoc, doc::CargoBook), + doc::Reference, doc::Rustdoc, doc::RustByExample, doc::CargoBook), Kind::Dist => describe!(dist::Docs, dist::Mingw, dist::Rustc, dist::DebuggerScripts, dist::Std, dist::Analysis, dist::Src, dist::PlainSourceTarball, dist::Cargo, dist::Rls, dist::Rustfmt, dist::Extended, dist::HashSign, diff --git a/src/bootstrap/doc.rs b/src/bootstrap/doc.rs index 178d60dd7df..d66c01eb499 100644 --- a/src/bootstrap/doc.rs +++ b/src/bootstrap/doc.rs @@ -12,7 +12,7 @@ //! //! This module implements generation for all bits and pieces of documentation //! for the Rust project. This notably includes suites like the rust book, the -//! nomicon, standalone documentation, etc. +//! nomicon, rust by example, standalone documentation, etc. //! //! Everything here is basically just a shim around calling either `rustbook` or //! `rustdoc`. @@ -69,6 +69,7 @@ book!( Nomicon, "src/doc/nomicon", "nomicon"; Reference, "src/doc/reference", "reference"; Rustdoc, "src/doc/rustdoc", "rustdoc"; + RustByExample, "src/doc/rust-by-example", "rust-by-example"; ); #[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)] diff --git a/src/doc/rust-by-example b/src/doc/rust-by-example new file mode 160000 +Subproject 4ebb8169dfe569b3dcbeab560607800bb717978 |