diff options
| author | Corey Farwell <coreyf@rwell.org> | 2017-03-20 23:44:57 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-20 23:44:57 -0400 |
| commit | 14b5d5658733d6428b983be6060db16bd5ba5c60 (patch) | |
| tree | 6f42595093aa54c393dbcb57063bf39c9957c43f /src/libstd | |
| parent | 42cfdc1955e7585caa61d6c9fd5553a2acf8ed86 (diff) | |
| parent | 96d35947c36bba6c6545c06768b5358c0f8bf3dc (diff) | |
| download | rust-14b5d5658733d6428b983be6060db16bd5ba5c60.tar.gz rust-14b5d5658733d6428b983be6060db16bd5ba5c60.zip | |
Rollup merge of #40332 - steveklabnik:extract-book, r=alexcrichton
Extract book into a submodule Part of https://github.com/rust-lang/rust/issues/39588 We probably don't want to land this till after the beta branches on friday, but would still ❤️ a review from @alexcrichton , since I am a rustbuild noob. This pr: 1. removes the book 2. adds it back in as a submodule 3. the submodule includes both the old book and the new book 4. it also includes an index page explaining the difference in editions 5. it also includes redirect pages for the old book URLs. 6. so we build all that stuff too. r? @alexcrichton
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/lib.rs | 10 | ||||
| -rw-r--r-- | src/libstd/primitive_docs.rs | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index d01ed1e3fe6..3da5d4b94dd 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -174,7 +174,7 @@ //! [slice]: primitive.slice.html //! [`atomic`]: sync/atomic/index.html //! [`collections`]: collections/index.html -//! [`for`]: ../book/loops.html#for +//! [`for`]: ../book/first-edition/loops.html#for //! [`format!`]: macro.format.html //! [`fs`]: fs/index.html //! [`io`]: io/index.html @@ -189,14 +189,14 @@ //! [`sync`]: sync/index.html //! [`thread`]: thread/index.html //! [`use std::env`]: env/index.html -//! [`use`]: ../book/crates-and-modules.html#importing-modules-with-use -//! [crate root]: ../book/crates-and-modules.html#basic-terminology-crates-and-modules +//! [`use`]: ../book/first-edition/crates-and-modules.html#importing-modules-with-use +//! [crate root]: ../book/first-edition/crates-and-modules.html#basic-terminology-crates-and-modules //! [crates.io]: https://crates.io -//! [deref coercions]: ../book/deref-coercions.html +//! [deref coercions]: ../book/first-edition/deref-coercions.html //! [files]: fs/struct.File.html //! [multithreading]: thread/index.html //! [other]: #what-is-in-the-standard-library-documentation -//! [primitive types]: ../book/primitive-types.html +//! [primitive types]: ../book/first-edition/primitive-types.html #![crate_name = "std"] #![stable(feature = "rust1", since = "1.0.0")] diff --git a/src/libstd/primitive_docs.rs b/src/libstd/primitive_docs.rs index 7d6d16f4748..c738dc94406 100644 --- a/src/libstd/primitive_docs.rs +++ b/src/libstd/primitive_docs.rs @@ -29,7 +29,7 @@ /// ``` /// /// [`assert!`]: macro.assert.html -/// [`if`]: ../book/if.html +/// [`if`]: ../book/first-edition/if.html /// [`BitAnd`]: ops/trait.BitAnd.html /// [`BitOr`]: ops/trait.BitOr.html /// [`Not`]: ops/trait.Not.html @@ -490,7 +490,7 @@ mod prim_str { } /// assert_eq!(tuple.2, 'c'); /// ``` /// -/// For more about tuples, see [the book](../book/primitive-types.html#tuples). +/// For more about tuples, see [the book](../book/first-edition/primitive-types.html#tuples). /// /// # Trait implementations /// |