Carol (Nichols || Goulding)
38c1c09437
Merge remote-tracking branch 'origin/generics'
2016-11-14 14:30:16 -05:00
Carol (Nichols || Goulding)
c346df7a56
Rename a function to something other than lifetime to prevent confusion
2016-11-14 14:24:13 -05:00
Carol (Nichols || Goulding)
a28ffd668d
Swap some emphasis underscores for asterisks
2016-11-14 14:23:18 -05:00
Carol (Nichols || Goulding)
f341124f33
Add some filenames and fn mains for clarity
2016-11-14 14:20:35 -05:00
Carol (Nichols || Goulding)
031619a189
Add a bit about lifetime annotations on methods
2016-11-14 13:37:53 -05:00
Carol (Nichols || Goulding)
df309071ee
Remove a sentence that didn't really say anything
2016-11-14 12:47:33 -05:00
Carol (Nichols || Goulding)
e6e56ed7d4
Reword to not say concept
2016-11-14 12:47:01 -05:00
Carol (Nichols || Goulding)
3c38b59ab6
Replace all uses of bash syntax highlighting
...
Since none of these are actually bash scripts :)
Changed all the instances in the src files to text, which, since my PR
to mdbook got accepted, will still do code background colors but no
syntax highlighting.
Fixes #295 and #327 .
2016-11-14 12:18:48 -05:00
Carol (Nichols || Goulding)
dbe2c1aa0b
Install mdbook from github for the code block fix
...
Until a new version of mdbook is released, use github that has my fix
that makes all code blocks have hljs so that they have the gray
background.
2016-11-14 12:03:27 -05:00
Carol (Nichols || Goulding)
bdc1a88cf7
Missed a language annotation
2016-11-13 17:50:49 -05:00
Carol (Nichols || Goulding)
9d63caa674
Rework lifetime examples
2016-11-13 17:47:54 -05:00
Carol (Nichols || Goulding)
aa269b9f61
Revisions prompted by comments from pornel
2016-11-12 14:36:43 -05:00
Carol (Nichols || Goulding)
775fbff97b
Fix the tests; clarify that this is just a fn signature
2016-11-12 13:20:45 -05:00
Carol (Nichols || Goulding)
f0a27c8762
Some rearranging to Lifetimes, up until "But why?"
2016-11-11 18:13:31 -05:00
Carol (Nichols || Goulding)
5f298bab49
Revise traits, and a little bit in syntax to make names match
...
A bit of rearranging, a bit cut, changing names so everything isn't
called `print`
2016-11-11 16:42:34 -05:00
Carol (Nichols || Goulding)
a035990c05
Revisions to generics syntax, and a bit to the intro too
...
So i lied
2016-11-11 14:51:20 -05:00
steveklabnik
71d753f59e
Finish off lifetime syntax
2016-11-11 13:40:30 -05:00
Carol (Nichols || Goulding)
7a66566d88
Clarify parts of the function extraction example
2016-11-11 11:38:59 -05:00
Carol (Nichols || Goulding)
be0bf4a49b
Motivate dealing with duplication and relation to generics more
...
And foreshadow what we'll cover in this chapter.
2016-11-11 11:23:22 -05:00
Carol (Nichols || Goulding)
830c5832fe
Clarify a statement about the lifetime elision rules
2016-11-11 11:01:51 -05:00
Carol (Nichols || Goulding)
e28b78dc2b
Add another question we need to answer
2016-11-11 10:56:42 -05:00
Carol (Nichols || Goulding)
befd5f681c
Be more precise about when naming lifetimes is required
2016-11-11 10:55:16 -05:00
Carol (Nichols || Goulding)
8da7f922e9
Add explicit outer blocks
2016-11-11 10:51:06 -05:00
Carol (Nichols || Goulding)
63a645dd45
Fixing analogy wording
2016-11-11 10:42:35 -05:00
Carol (Nichols || Goulding)
d8eebfcfe1
Be more precise about what's in the prelude
2016-11-11 10:40:31 -05:00
Carol (Nichols || Goulding)
0b18dddb42
Correct code example to illustrate generics
2016-11-11 10:39:04 -05:00
Carol (Nichols || Goulding)
77fc0ed4f7
Add a summary section placeholder
2016-11-10 22:26:31 -05:00
Carol (Nichols || Goulding)
5fa5071c01
Standardize heading formatting
...
- Bump subsections in a level
- Title case
- Code formatting
2016-11-10 22:26:10 -05:00
Carol (Nichols || Goulding)
ab9b43602d
Out of context, this indent looks strange
2016-11-10 22:21:24 -05:00
Carol (Nichols || Goulding)
576d613330
Rustfmt this long println
2016-11-10 22:21:02 -05:00
Carol (Nichols || Goulding)
3c884c88f7
Newline between code block and text
2016-11-10 22:19:07 -05:00
Carol (Nichols || Goulding)
2aaaaddfb8
Fix line wrapping
2016-11-10 22:11:17 -05:00
Carol (Nichols || Goulding)
ce3bb00bdc
Ignoring two code examples that should be ignored
2016-11-10 22:07:47 -05:00
Carol (Nichols || Goulding)
08942bab37
Removing trailing whitespace
2016-11-10 22:05:10 -05:00
Carol (Nichols || Goulding)
16930f969a
Removing duplicate closures chapter; rebasing made git confused
2016-11-10 22:03:53 -05:00
Steve Klabnik
6190991102
More lifetimes
2016-11-10 22:02:57 -05:00
Steve Klabnik
c7644ce9b5
some work on lifetimes
2016-11-10 22:02:57 -05:00
Carol (Nichols || Goulding)
7dc9bcbe80
Small wording edits
2016-11-10 22:02:57 -05:00
Steve Klabnik
479b254803
Start of generics chapter
2016-11-10 22:02:57 -05:00
Steve Klabnik
dfe2d91dbb
Break syntax out into its own chapter
...
we probably want a better title, idk
2016-11-10 22:02:57 -05:00
Steve Klabnik
c677e23116
get set up
2016-11-10 22:02:57 -05:00
Carol (Nichols || Goulding)
a0d0115765
Merge pull request #326 from rust-lang/question-mark
...
Use stable in .travis.yml
2016-11-10 18:01:52 -05:00
Carol (Nichols || Goulding)
a08e7fab8f
Document the graphviz stuff for my own benefit
...
So that I don't have to look it up and figure out what I did to get them
to work the last time.
2016-11-10 17:59:12 -05:00
Carol (Nichols || Goulding)
7d41f6caa3
Swap the labels of s1 and s2 in 4-3 to better match 4-2
...
Fixes #282 .
2016-11-10 17:58:24 -05:00
Carol (Nichols || Goulding)
d199e608d8
Clarify that we likely won't change chapters that have gone to layout
...
Fixes #324 .
2016-11-10 17:36:47 -05:00
Carol (Nichols || Goulding)
392a5b066c
Rename file to match section heading
2016-11-10 17:05:47 -05:00
Carol (Nichols || Goulding)
89732cc1df
Merge remote-tracking branch 'origin/pr/320'
2016-11-10 17:03:59 -05:00
Carol (Nichols || Goulding)
a97e5a81d5
Merge pull request #325 from rust-lang/const
...
Add a section about const
2016-11-10 16:57:24 -05:00
Carol (Nichols || Goulding)
04aa2cd854
Fixing steve nits
2016-11-10 16:12:23 -05:00
Steve Klabnik
facbc69009
Remove question_mark feature
2016-11-10 15:19:49 -05:00
