Commit Graph

3565 Commits

Author SHA1 Message Date
Carol (Nichols || Goulding)
322aa86fa2 Merge pull request #1863 from vlad20012/patch-1
Fix code snippet
2019-03-26 16:53:13 -04:00
Carol (Nichols || Goulding)
6a115b42d2 Merge pull request #1881 from chirgjn/patch-1
Fix mdbook link text in readme
2019-03-26 16:47:08 -04:00
Carol (Nichols || Goulding)
828d794db4 Wrap to 80 cols 2019-03-26 16:46:30 -04:00
Carol (Nichols || Goulding)
3360194abf Merge pull request #1885 from king6cong/complete
Make sentence more complete
2019-03-26 16:45:44 -04:00
Carol (Nichols || Goulding)
eb66c9c3e0 Merge pull request #1884 from nicholasshirley/master
consistenly use increment and decrement
2019-03-26 16:45:01 -04:00
king6cong
9c3a5bc026 Make sentence more complete 2019-03-26 20:33:45 +08:00
Nicholas Shirley
5179c2a60f remove leftover '=' 2019-03-25 09:44:32 +01:00
Nicholas Shirley
cfb8fb9bb9 consistenly use increment and decrement
Ch 3.5 uses two different styles to increment and decrement numbers:

`number +=1;`

`number = number + 1;`

This picks the first form and applies it to all examples.
2019-03-25 08:59:10 +01:00
Chirag Jain
705cdc1c58 Fix mdbook link text in readme
I found reading that big link a bit weird, feel free to reject the PR 😄
2019-03-24 01:15:46 +05:30
Carol (Nichols || Goulding)
feeaff2f4e Merge pull request #1878 from ehuss/fix-conditional-compilation
Fix link to Reference's conditional-compilation.
2019-03-21 17:48:07 -04:00
Eric Huss
a2bbd29cb9 Fix link to Reference's conditional-compilation. 2019-03-21 14:26:40 -07:00
Carol (Nichols || Goulding)
d6f7d1537b Fix subject/verb agreement 2019-03-21 13:15:57 -04:00
Carol (Nichols || Goulding)
aaa5b32003 Remove nostarch snapshot files that have been incorporated and checked 2019-03-21 13:15:57 -04:00
Carol (Nichols || Goulding)
0de4a7d66a haha teach the dictionary steve's name
apparently nichols is fine????
2019-03-21 12:17:56 -04:00
Carol (Nichols || Goulding)
e6befd9e21 Add authorship info to the front page
Fixes #1864.
2019-03-20 10:20:32 -04:00
Carol (Nichols || Goulding)
4fb0aedf88 Merge pull request #1866 from s3bk/master
fix accidental <ol>'s
2019-03-20 10:14:02 -04:00
Sebastian Köln
d74d392e68 fix accidental <ol>'s 2019-03-18 20:53:53 +01:00
Vlad Beskrovnyy
6aa13a6e63 Fix code snippet
```rust
type Result<T> = Result<T, std::io::Error>;
```
This example [doesn't compiled](https://play.rust-lang.org/?version=stable&mode=debug&edition=2018&gist=7b13da576c5fd89ca3e2a89720c3fc8c):
```
error[E0107]: wrong number of type arguments: expected 1, found 2
 --> src/main.rs:1:28
  |
1 | type Result<T> = Result<T, std::io::Error>;
  |                            ^^^^^^^^^^^^^^ unexpected type argument

error[E0391]: cycle detected when processing `Result`
 --> src/main.rs:1:18
  |
1 | type Result<T> = Result<T, std::io::Error>;
  |                  ^^^^^^^^^^^^^^^^^^^^^^^^^
  |
  = note: ...which again requires processing `Result`, completing the cycle
```
2019-03-15 12:17:03 +03:00
Carol (Nichols || Goulding)
51053e97dd Merge pull request #1848 from rust-lang/ch19
Edits to Macros
2019-03-11 15:46:58 -04:00
Carol (Nichols || Goulding)
538efa8574 Mention lock returns MutexGuard wrapped in a LockResult
Fixes the issue in a different way from #1850
2019-03-10 14:10:50 -04:00
Carol (Nichols || Goulding)
d7df985b7f Merge pull request #1842 from rust-lang/add-nll-example
Add an example that illustrates NLL
2019-03-10 13:58:26 -04:00
Carol (Nichols || Goulding)
98e4db374b Temporarily ignore an example because of a rustdoc bug
Should be fixed in rust 1.35
2019-03-10 13:41:29 -04:00
Carol (Nichols || Goulding)
26bc1b2e7b spellingz 2019-03-08 20:36:03 -05:00
Carol (Nichols || Goulding)
afba420af2 Propagate changes to markdown 2019-03-08 20:19:46 -05:00
Carol (Nichols || Goulding)
a889e16b0f Carol's edits 2019-03-08 20:06:49 -05:00
Carol (Nichols || Goulding)
d28549a2a4 Chapter 19 as received from nostarch 2019-03-08 15:44:23 -05:00
Carol (Nichols || Goulding)
fa6519e87f Specify edition2018 2019-03-08 08:27:22 -05:00
Carol (Nichols || Goulding)
506ce62eed Merge pull request #1845 from fieldinrain/fix_parameter_name
change the parameter name from `type` to `kind`
2019-03-08 08:13:09 -05:00
fieldinrain
83165fe466 fix parameter name 2019-03-05 19:08:10 +09:00
Carol (Nichols || Goulding)
11bedee95a Add an example that illustrates NLL 2019-03-03 15:01:25 -05:00
Carol (Nichols || Goulding)
9cffbeabec Merge pull request #1838 from rust-lang/more-edits
More edits
2019-03-02 08:22:41 -05:00
Carol (Nichols || Goulding)
d83f107a88 spellingz 2019-03-02 08:00:40 -05:00
Carol (Nichols || Goulding)
f1d2586109 Propagate changes to markdown 2019-03-01 22:01:37 -05:00
Carol (Nichols || Goulding)
35086d8834 Carol's edits 2019-03-01 22:01:37 -05:00
Carol (Nichols || Goulding)
72980ab5aa Docx files as received from nostarch 2019-03-01 16:56:56 -05:00
Carol (Nichols || Goulding)
8b3ad7fef3 Remove the 2018 edition nostarch directory
I'm not using this anymore and it's just confusing people
2019-03-01 16:54:21 -05:00
Carol (Nichols || Goulding)
fab9419503 Merge pull request #1832 from kornelski/chapterrename
Update links to ch07-02
2019-02-25 07:53:23 -05:00
Kornel
1768b73dcc More link fixes 2019-02-25 01:33:17 +00:00
Kornel
d2336f4186 Update links to ch07-02 2019-02-24 22:57:21 +00:00
Carol (Nichols || Goulding)
76df60bcce fancy quotes 2019-02-24 12:18:12 -05:00
Carol (Nichols || Goulding)
6cd30387f6 Merge pull request #1824 from rust-lang/next-round-of-edits
Next round of edits
2019-02-24 12:17:07 -05:00
Carol (Nichols || Goulding)
ac6e4a003b Merge pull request #1788 from kornelski/noindex
Purge the first edition stubs from search engines
2019-02-24 12:07:20 -05:00
Carol (Nichols || Goulding)
a40e84321f Remove extra space 2019-02-24 11:58:14 -05:00
Kornel Lesiński
6f162249f8 Exclude old second-edition and 2018-edition stub pages from search engines 2019-02-21 00:38:23 +00:00
Carol (Nichols || Goulding)
6d3e77c8fa Merge pull request #1825 from BooleanCat/indices
Consistently use indices over indexes
2019-02-20 14:39:50 -05:00
Carol (Nichols || Goulding)
059c99f792 Merge pull request #1826 from xtian/patch-1
ch10-03-lifetime-syntax.md: Improve sentence structure in method lifetime elision section
2019-02-20 14:39:07 -05:00
Christian Wesselhoeft
2c44e9b72e ch10-03-lifetime-syntax.md: Improve sentence structure 2019-02-20 09:33:35 -07:00
Tom Godkin
03611fc861 Consistently use indices over indexes
Most the the book pluralises index as indices, except in one place where
it is pluralised as indexes. This chooses the more common "indices".
2019-02-20 15:01:46 +00:00
Carol (Nichols || Goulding)
540f3088c6 Merge pull request #1754 from rust-lang/gh1645
tweak wording around binaries
2019-02-19 09:01:29 -05:00
Steve Klabnik
4b43cf4ea8 tweak wording around binaries
Fixes #1645
2019-02-18 21:58:22 -05:00