Commit Graph

429 Commits

Author SHA1 Message Date
Carol (Nichols || Goulding)
f6e536a1a2 Reorder so patterns is after match like the lead-in says
Fixes #113.
2016-07-01 18:56:45 -06:00
Carol (Nichols || Goulding)
7dd27c66c2 Annotate numeric types so the error message doesn't have _
I think having a better error message will be less confusing than the
type annotations here. I think the type annotations might actually help
because now it's clearer that `i8` is `T` in this case.

Also this error message has changed.
2016-07-01 18:56:45 -06:00
Carol (Nichols || Goulding)
e5a638b4c7 Hard wrap at 80 chars 2016-07-01 18:56:45 -06:00
Carol (Nichols || Goulding)
8f62f51e74 Make the verb tense consistent 2016-07-01 18:56:45 -06:00
Carol (Nichols || Goulding)
8059a9301d Clarify expression/condition/value usage in context of match
Connects to #112. It gets a little confusing when we're talking about a
lot of nested expressions. The patterns aren't really getting matched to
the expression, they're matched to the resulting value of the
expression.
2016-07-01 18:56:45 -06:00
Carol (Nichols || Goulding)
59ed464072 Be more specific and detailed in a few places 2016-07-01 18:56:45 -06:00
Carol (Nichols || Goulding)
b508f9c5e7 Restore some leading-into-match text in the right spot
I did like the lead-in to why we would want match that was at the end of
the enum section that I took out because match wasn't the next section.
Put it back in Option since match is the next section after Option.
2016-07-01 18:56:45 -06:00
Carol (Nichols || Goulding)
2051794d20 Calling Option a type is a bit confusing imo
I mean, it *is*, but we said we were going to cover Option because it
was an enum, so it might be confusing to start calling it a type if the
reader hasn't fully understood that enums are types yet.
2016-07-01 18:56:45 -06:00
Carol (Nichols || Goulding)
4db3b220b0 The reader might not "have a handle on enums" here
Especially since we're only a small part of the way through this
section.
2016-07-01 18:56:44 -06:00
Carol (Nichols || Goulding)
b67b0522e8 Have enums lead into Option rather than match
Connects to #113.
2016-07-01 18:56:44 -06:00
Carol (Nichols || Goulding)
d6502d203f Spelling edits 2016-07-01 18:56:44 -06:00
Carol (Nichols || Goulding)
e89ff36d59 Phrasing edits 2016-07-01 18:56:44 -06:00
Carol (Nichols || Goulding)
3b4efffe4d Punctuation edits 2016-07-01 18:56:44 -06:00
Boris Egorov
e35482fb82 chapter3: Fix multiple-argument functions signatures 2016-06-30 17:49:08 +06:00
Carol (Nichols || Goulding)
7470b4c17e Hide a newline in a code example with hidden code
This looks nicer.

Connects to #106.
2016-06-29 22:08:50 -06:00
Carol (Nichols || Goulding)
7027c996c9 Change type from u32 to u8 to match IPv4 spec
Each segment of an ipv4 address can only be 0-255, so each of the
segments only need to be u8s.

If, however, this was done to not have to explain the difference between
u32 and u8, or if this would be distracting from the point about enums
trying to be made here, I would be fine reverting this change.
2016-06-29 19:10:22 -06:00
Carol (Nichols || Goulding)
5b6fb9d2c4 Fix messed up rename 2016-06-27 15:43:43 -06:00
Carol (Nichols || Goulding)
475ecc7679 Rename files to match the nostarch structure more closely 2016-06-27 15:35:52 -06:00
Carol (Nichols || Goulding)
54c47de023 Merge pull request #95 from justsostephen/master
Spelling correction and revised wording.
2016-06-27 17:31:59 -04:00
Carol (Nichols || Goulding)
5f39fe96bd Merge pull request #91 from Chris-O-Neill/master
Updated pronouns and rustup.sh output in installation.md.
2016-06-27 17:28:08 -04:00
Carol (Nichols || Goulding)
54d6e14adc Merge pull request #86 from xtian/patch-1
copy -> move
2016-06-27 17:18:36 -04:00
Carol (Nichols || Goulding)
23d375b35c Merge pull request #99 from lukelafountaine/master
remove extraneous and potentially confusing variable declaration
2016-06-27 17:16:40 -04:00
Steve Klabnik
e6d992262b send chapter 5 and 6 to no starch 2016-06-03 10:30:35 -04:00
Stephen Mather
2769833a97 installation.md: Corrected spelling of 'internet'. 2016-06-01 21:25:08 +01:00
Stephen Mather
d5b2189dea hello-world.md: Removed references to creating a new executable from 'Converting to Cargo'. 2016-06-01 21:10:12 +01:00
Steve Klabnik
8c5098f65b Merge pull request #105 from rust-lang/enums-match
Enums: other stuff
2016-05-31 15:14:08 -04:00
Steve Klabnik
ef77b20f9d address some feedback 2016-05-31 15:13:50 -04:00
Steve Klabnik
dbb4cdcc03 Merge pull request #104 from rust-lang/structs-generics
Draft: generics section of structs chapter
2016-05-31 14:57:45 -04:00
Steve Klabnik
da6df3af0b Address some feedback 2016-05-31 14:54:39 -04:00
steveklabnik
1227640bc0 second half 2016-05-19 17:46:33 -04:00
steveklabnik
f23e4b3d5a First bit of sub-chapters of enums 2016-05-19 16:29:46 -04:00
steveklabnik
54d3dc1059 Add windows vim temp files to .gitignore 2016-05-19 16:29:25 -04:00
steveklabnik
6504e399f8 Draft: generics section of structs chapter
A light introduction to syntax.
2016-05-19 14:35:20 -04:00
Luke LaFountaine
5b89e40a07 remove extraneous and potentially confusing variable declaration 2016-05-14 20:13:03 -07:00
Steve Klabnik
747245682d Merge pull request #98 from rust-lang/enums
First draft of enums
2016-05-13 16:54:29 -04:00
Steve Klabnik
08579a3d80 First draft of enums 2016-05-06 16:20:57 -04:00
Steve Klabnik
789fe48d8d test the trains only 2016-05-06 15:53:57 -04:00
Steve Klabnik
6bb5c6ac76 Update README to remove issue labels
This system wasn't as useful as I'd hoped.
2016-05-06 14:58:36 -04:00
Chris O'Neill
3e8117319e Updated pronouns for consistency and clarity. 2016-04-10 12:53:30 +01:00
Chris O'Neill
f5f645231b Update output of rustup.sh install script. 2016-04-10 12:49:12 +01:00
Steve Klabnik
568742e949 Merge pull request #89 from uraza/master
move should be used instead of mv on Windows
2016-03-31 09:25:20 -07:00
Jeremy 0
ab84970b33 move should be used instead of mv on Windows 2016-03-31 09:01:49 +02:00
Christian Wesselhoeft
d0fb44ec2d copy -> move 2016-03-27 12:17:17 -06:00
Steve Klabnik
3437fca04d ship chapter 4 to nostarch 2016-03-25 10:10:45 -04:00
Steve Klabnik
61194c7b8f Merge pull request #70 from rust-lang/method_syntax
First draft: method syntax
2016-03-24 14:21:15 -04:00
Steve Klabnik
2bb8546a32 Merge pull request #83 from clemensw/slices_suggestions
Notes on slices.md
2016-03-10 00:34:14 +03:00
Clemens Wehrmann
5205a78f2a More clear to me than 'maximum value'.
Difficult talking about elements since array slices are discussed later and
Strings have confusing elements (byte/char).
2016-03-09 22:16:14 +01:00
Clemens Wehrmann
a90ac1e0ca Something (perhaps not this) should be said about the syntax. 2016-03-09 22:16:14 +01:00
Clemens Wehrmann
592c518fb6 Example is less confusing if the assignments align content with identifiers 2016-03-09 22:16:14 +01:00
Steve Klabnik
080657796f slightly more clear language 2016-03-09 10:51:11 -05:00