Commit Graph

1211 Commits

Author SHA1 Message Date
Luc Street
ba7b12f2b0 Fix a pesky type error
```
error[E0308]: mismatched types
  --> src/ch08-03-hash-maps.md:44:15
   |
44 | keys of type `&str` and values of type `i32`. Like vectors, hash maps are
   |               ^ expected struct `std::string::String`, found &str
   |
   = note: to fix, merge this pull request
```
2017-01-03 19:10:26 -08:00
Luc Street
6a02662ea2 Use a String when explaining internal representation
- Line 259 refers to the `Vec` storing the string "Hola", but this isn't true for the examples using a `&'static str`
- Use `String::from` to demonstrate the use of the wrapper around `Vec<u8>`
2017-01-03 18:33:31 -08:00
Luc Street
b530e465f3 Tighten up concatenation function a bit 2017-01-02 22:44:45 -08:00
Luc Street
77370c0736 Change 'argument' to 'parameter' in a few places
Source: http://stackoverflow.com/a/156787
- Make a couple consequent edits for clarity/phrasing
2017-01-02 12:48:21 -08:00
Carol (Nichols || Goulding)
8e11255af5 Fix file paths to match convention 2016-12-30 13:16:42 -05:00
Carol (Nichols || Goulding)
938ed6519a Fix typos, add words to dictionary 2016-12-30 13:15:55 -05:00
Carol (Nichols || Goulding)
2d32840aae Update chapter reference. Fixes #376. 2016-12-30 12:54:05 -05:00
Carol (Nichols || Goulding)
901aa3d788 Fix code examples and output 2016-12-30 12:43:26 -05:00
Carol (Nichols || Goulding)
1a7c4764e7 Improving code examples 2016-12-30 11:39:07 -05:00
Carol (Nichols || Goulding)
87dede1cb0 Merge remote-tracking branch 'origin/master' into cargo-and-cratesio 2016-12-29 14:30:33 -05:00
Carol (Nichols || Goulding)
69447b8633 Merge pull request #372 from aaaxx/patch-1
Fix reference to wrong figure
2016-12-29 14:14:19 -05:00
Carol (Nichols || Goulding)
2d886dad20 Ship Chapter 12 I/O Project to nostarch 2016-12-29 10:40:14 -05:00
Carol (Nichols || Goulding)
9687722e61 Merge remote-tracking branch 'origin/io-project' 2016-12-29 10:36:23 -05:00
Carol (Nichols || Goulding)
c8b6fad1ba Space needed before curly braces 2016-12-29 10:36:07 -05:00
Carol (Nichols || Goulding)
469ace636c Make the paragraph about whether it's worth it to use clone into a box 2016-12-29 10:34:52 -05:00
Carol (Nichols || Goulding)
30550a8365 Don't mention the next function since we don't use it 2016-12-29 10:31:49 -05:00
Carol (Nichols || Goulding)
42c876b3ff Fix extra whitespace 2016-12-29 10:31:06 -05:00
Carol (Nichols || Goulding)
f15fe19f64 Get ch 9 ready to ship to nostarch 2016-12-28 20:42:58 -05:00
Carol (Nichols || Goulding)
eef7eac9b6 Fix some problems so the nostarch script runs 2016-12-28 20:39:30 -05:00
Carol (Nichols || Goulding)
e5fd66a122 Merge remote-tracking branch 'origin/ch9-edits' 2016-12-28 20:27:05 -05:00
Carol (Nichols || Goulding)
a70d684317 Reword a comment 2016-12-28 20:26:52 -05:00
Carol (Nichols || Goulding)
7f9a149b80 Explain ref 2016-12-28 20:25:34 -05:00
Carol (Nichols || Goulding)
c76e72fa7e Reword awkwardness 2016-12-28 20:22:38 -05:00
Carol (Nichols || Goulding)
587d605c81 One more in the dictionary 2016-12-28 20:06:40 -05:00
Carol (Nichols || Goulding)
609f68f3e9 Fix a filename to match conventions 2016-12-28 20:00:02 -05:00
Carol (Nichols || Goulding)
54e8d79012 Merge remote-tracking branch 'origin/master' into io-project 2016-12-28 19:59:08 -05:00
Carol (Nichols || Goulding)
a62a15131c Fixing more spelling 2016-12-28 19:52:31 -05:00
Carol (Nichols || Goulding)
de6075be98 Fixing more spelling mistakes!!!!! 2016-12-28 19:48:06 -05:00
Carol (Nichols || Goulding)
f85c7af6cd Fix misspellings or add words to the dictionary 2016-12-28 18:39:01 -05:00
Carol (Nichols || Goulding)
70efcbe967 Add some words to the dictionary 2016-12-28 18:32:55 -05:00
Carol (Nichols || Goulding)
e46fd3c432 Use capitals instead of italics for grep explanation 2016-12-28 18:30:03 -05:00
Carol (Nichols || Goulding)
01af63778c Split into sections and add more headings 2016-12-28 18:27:45 -05:00
Carol (Nichols || Goulding)
7f58e97599 Merge remote-tracking branch 'origin/master' into io-project 2016-12-28 18:03:35 -05:00
Carol (Nichols || Goulding)
991844d9ae Finish my first edit of ch 12 2016-12-28 18:02:59 -05:00
Carol (Nichols || Goulding)
99db509737 Get code blocks to compile 2016-12-27 18:17:05 -05:00
Steve Klabnik
84e335ef99 Initial work on cargo + crates.io chapter 2016-12-27 15:59:17 -05:00
Carol (Nichols || Goulding)
817d64276b Really rough outline notes 2016-12-27 09:54:03 -05:00
Steve Klabnik
3cd2cb2890 finish up the last bit 2016-12-27 09:29:47 -05:00
Carol (Nichols || Goulding)
948b1b4177 Outline for cargo chapter 2016-12-26 16:33:28 -05:00
Carol (Nichols || Goulding)
3a0ff3c7c1 More notes, small changes to TOC 2016-12-26 16:03:45 -05:00
Carol (Nichols || Goulding)
8919f24fc1 Remove FFI - let's do a separate minibook instead. 2016-12-26 15:56:56 -05:00
Carol (Nichols || Goulding)
20c8df08ea Move nightly to appendix 2016-12-26 15:56:03 -05:00
aaaxx
0a10b2f956 Fix reference to wrong figure
Please double check if I got this concept right; I'm a programming noob.
2016-12-26 07:26:53 +01:00
Carol (Nichols || Goulding)
f3e052020a Doing that thing i do 2016-12-23 14:35:00 -05:00
Brian Anderson
38eb5d8e48 Enum edits 2016-12-23 00:56:11 +00:00
Carol (Nichols || Goulding)
85d7ac52f7 oh fine 2016-12-22 19:08:50 -05:00
Carol (Nichols || Goulding)
6edf3a3530 Fix spelling errors caught by aspell!!!!!!!!! 2016-12-22 18:55:29 -05:00
Carol (Nichols || Goulding)
5e5919fe83 Only build the master branch; we usually have PRs for other branches
Now that lots of other rust-lang stuff is using travis, I don't want to
take 2 spots in the queue every time we push to a PR!
2016-12-22 18:46:44 -05:00
Carol (Nichols || Goulding)
19d7a9bec8 Adding use statements needed to make the tests pass
Not sure why Read isn't needed in the other read_to_string examples...
2016-12-22 18:41:37 -05:00
Carol (Nichols || Goulding)
eb7a5e03c0 Add plural backtraces to the dictionary 2016-12-22 18:36:16 -05:00