Skip to content

Commit efa4088

Browse files
committed
Merge remote-tracking branch 'origin/master' into error-handling
2 parents e423602 + 85fd039 commit efa4088

Some content is hidden

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

58 files changed

+8787
-7660
lines changed

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,6 @@
11
book/
22
*~
3+
.idea
4+
.DS_Store
5+
target
6+

.travis.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,11 @@ rust:
55
- beta
66
- stable
77
before_script:
8-
- cargo install mdbook
8+
- cargo install mdbook --git https://github.com/azerupi/mdBook.git
99
script:
1010
- PATH=$PATH:/home/travis/.cargo/bin mdbook test
1111
- PATH=$PATH:/home/travis/.cargo/bin mdbook build
12+
- cargo run --bin lfp src
1213
after_success:
1314
- test $TRAVIS_PULL_REQUEST == "false" && test $TRAVIS_BRANCH == "master" && bash deploy.sh
1415
env:

Cargo.lock

Lines changed: 140 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
[package]
2+
name = "rust-book"
3+
version = "0.0.1"
4+
authors = ["Steve Klabnik <[email protected]>"]
5+
description = "The Rust Book"
6+
7+
[dependencies]
8+
walkdir = "0.1.5"
9+
docopt = "0.6.82"
10+
rustc-serialize = "0.3.19"

README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# The Rust Programming Language
22

3+
[![Build Status](https://travis-ci.org/rust-lang/book.svg?branch=master)](https://travis-ci.org/rust-lang/book)
4+
35
This is the next iteration of “The Rust Programming Language”, which is
46
currently located [in the main Rust repository][src]. If you want to read the
57
book, you should check it out there or [on the web][prod].
@@ -13,7 +15,7 @@ If you would like to see this version rendered, it’s [on GitHub pages][html].
1315

1416
## Requirements
1517

16-
Building the book requires [mdBook]. To get it:
18+
Building the book requires [mdBook] >= v0.0.13. To get it:
1719

1820
[mdBook]: https://github.com/azerupi/mdBook
1921

nostarch/appendix.md

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
# Appendix
2+
3+
The following sections contain reference material you may find useful in your
4+
Rust journey.
5+
6+
## Keywords
7+
8+
The following keywords are reserved by the Rust language and may not be used as
9+
names of functions, variables, macros, modules, crates, constants, static
10+
values, attributes, struct fields, or arguments.
11+
12+
* `abstract`
13+
* `alignof`
14+
* `as`
15+
* `become`
16+
* `box`
17+
* `break`
18+
* `const`
19+
* `continue`
20+
* `crate`
21+
* `do`
22+
* `else`
23+
* `enum`
24+
* `extern`
25+
* `false`
26+
* `final`
27+
* `fn`
28+
* `for`
29+
* `if`
30+
* `impl`
31+
* `in`
32+
* `let`
33+
* `loop`
34+
* `macro`
35+
* `match`
36+
* `mod`
37+
* `move`
38+
* `mut`
39+
* `offsetof`
40+
* `override`
41+
* `priv`
42+
* `proc`
43+
* `pub`
44+
* `pure`
45+
* `ref`
46+
* `return`
47+
* `Self`
48+
* `self`
49+
* `sizeof`
50+
* `static`
51+
* `struct`
52+
* `super`
53+
* `trait`
54+
* `true`
55+
* `type`
56+
* `typeof`
57+
* `unsafe`
58+
* `unsized`
59+
* `use`
60+
* `virtual`
61+
* `where`
62+
* `while`
63+
* `yield`

0 commit comments

Comments
 (0)