Skip to content

Commit 3ac1442

Browse files
committed
---
yaml --- r: 152897 b: refs/heads/try2 c: afdb19b h: refs/heads/master i: 152895: 38db87d v: v3
1 parent 5fcf280 commit 3ac1442

File tree

3 files changed

+67
-7
lines changed

3 files changed

+67
-7
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
55
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: 17021944be992f0895127e806806a482121bd2a7
8+
refs/heads/try2: afdb19b3b5df42264b90ac98d92df24e92dc5982
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/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/try2/src/doc/tutorial.md

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -493,12 +493,11 @@ 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
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.
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.
502501

503502
~~~
504503
# let my_number = 1;

0 commit comments

Comments
 (0)