Skip to content

Commit 12c82f4

Browse files
committed
---
yaml --- r: 121838 b: refs/heads/snap-stage3 c: d098387 h: refs/heads/master v: v3
1 parent 03d8da4 commit 12c82f4

File tree

3 files changed

+68
-6
lines changed

3 files changed

+68
-6
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: d0983872efeea757600031a081a2eff9676fe895
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: 510372129e6e7a536e3fde0e2d82c0878f1344ec
4+
refs/heads/snap-stage3: d0983872efeea757600031a081a2eff9676fe895
55
refs/heads/try: 18dc3bc9e3314a250c0718ab329938e676410cdf
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/doc/guide.md

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -411,3 +411,64 @@ rest of your Rust career.
411411

412412
Next, we'll learn more about Rust itself, by starting to write a more complicated
413413
program. We hope you want to do more with Rust than just print "Hello, world!"
414+
415+
## If
416+
417+
## Functions
418+
419+
return
420+
421+
comments
422+
423+
## Testing
424+
425+
attributes
426+
427+
stability markers
428+
429+
## Crates and Modules
430+
431+
visibility
432+
433+
## Compound Data Types
434+
435+
Tuples
436+
437+
Structs
438+
439+
Enums
440+
441+
## Match
442+
443+
## Looping
444+
445+
for
446+
447+
while
448+
449+
loop
450+
451+
break/continue
452+
453+
iterators
454+
455+
## Lambdas
456+
457+
## Generics
458+
459+
## Traits
460+
461+
## Operators and built-in Traits
462+
463+
## Ownership and Lifetimes
464+
465+
Move vs. Copy
466+
467+
Allocation
468+
469+
## Tasks
470+
471+
## Macros
472+
473+
## Unsafe
474+

branches/snap-stage3/src/doc/tutorial.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -493,11 +493,12 @@ by an *action* (expression). Each case is separated by commas. It is
493493
often convenient to use a block expression for each case, in which case
494494
the commas are optional as shown below. Literals are valid patterns and
495495
match only their own value. A single arm may match multiple different
496-
patterns by combining them with the pipe operator (`|`), so long as every
497-
pattern binds the same set of variables. Ranges of numeric literal
498-
patterns can be expressed with two dots, as in `M..N`. The underscore
499-
(`_`) is a wildcard pattern that matches any single value. (`..`) is a
500-
different wildcard that can match one or more fields in an `enum` variant.
496+
patterns by combining them with the pipe operator (`|`), so long as
497+
every pattern binds the same set of variables (see "destructuring"
498+
below). Ranges of numeric literal patterns can be expressed with two
499+
dots, as in `M..N`. The underscore (`_`) is a wildcard pattern that
500+
matches any single value. (`..`) is a different wildcard that can match
501+
one or more fields in an `enum` variant.
501502

502503
~~~
503504
# let my_number = 1;

0 commit comments

Comments
 (0)