Skip to content

Commit 025c328

Browse files
committed
Auto merge of #39633 - steveklabnik:vendor-mdbook, r=alexcrichton
Port books to mdbook Part of #39588 blocked on #39431 As a first step towards the bookshelf, we ~vendor mdbook in-tree and~ port our books to it. Eventually, both of these books will be moved out-of-tree, but the nightly book will rely on doing the same thing. As such, this intermediate step is useful. r? @alexcrichton @brson /cc @azerupi
2 parents e8154a0 + cacb3bc commit 025c328

File tree

151 files changed

+587
-1199
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

151 files changed

+587
-1199
lines changed

.gitattributes

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@
66
*.rs rust
77
src/etc/installer/gfx/* binary
88
*.woff binary
9-
src/vendor/* binary
9+
src/vendor/** -text

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -100,3 +100,4 @@ version.md
100100
version.ml
101101
version.texi
102102
.cargo
103+
!src/vendor/**

src/Cargo.lock

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

src/bootstrap/doc.rs

+1
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ pub fn rustbook(build: &Build, target: &str, name: &str) {
4747
build.run(build.tool_cmd(&compiler, "rustbook")
4848
.arg("build")
4949
.arg(&src)
50+
.arg("-d")
5051
.arg(out));
5152
}
5253

src/doc/book/README.md src/doc/book/src/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
% The Rust Programming Language
1+
# The Rust Programming Language
22

33
Welcome! This book will teach you about the [Rust Programming Language][rust].
44
Rust is a systems programming language focused on three goals: safety, speed,

src/doc/book/SUMMARY.md src/doc/book/src/SUMMARY.md

+2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# Summary
22

3+
[Introduction](README.md)
4+
35
* [Getting Started](getting-started.md)
46
* [Tutorial: Guessing Game](guessing-game.md)
57
* [Syntax and Semantics](syntax-and-semantics.md)

src/doc/book/advanced-linking.md src/doc/book/src/advanced-linking.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
% Advanced Linking
1+
# Advanced Linking
22

33
The common cases of linking with Rust have been covered earlier in this book,
44
but supporting the range of linking possibilities made available by other

src/doc/book/associated-constants.md src/doc/book/src/associated-constants.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
% Associated Constants
1+
# Associated Constants
22

33
With the `associated_consts` feature, you can define constants like this:
44

src/doc/book/associated-types.md src/doc/book/src/associated-types.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
% Associated Types
1+
# Associated Types
22

33
Associated types are a powerful part of Rust’s type system. They’re related to
44
the idea of a ‘type family’, in other words, grouping multiple types together. That

src/doc/book/attributes.md src/doc/book/src/attributes.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
% Attributes
1+
# Attributes
22

33
Declarations can be annotated with ‘attributes’ in Rust. They look like this:
44

src/doc/book/benchmark-tests.md src/doc/book/src/benchmark-tests.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
% Benchmark tests
1+
# Benchmark tests
22

33
Rust supports benchmark tests, which can test the performance of your
44
code. Let's make our `src/lib.rs` look like this (comments elided):

src/doc/book/bibliography.md src/doc/book/src/bibliography.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
% Bibliography
1+
# Bibliography
22

33
This is a reading list of material relevant to Rust. It includes prior
44
research that has - at one time or another - influenced the design of

0 commit comments

Comments
 (0)