Skip to content

Commit 3d088eb

Browse files
froydnjalexcrichton
authored andcommitted
---
yaml --- r: 122495 b: refs/heads/master c: 704f11d h: refs/heads/master i: 122493: 5416a54 122491: fd491b8 122487: 131950d 122479: 797851e 122463: 55854f8 122431: cace63f 122367: af1c2fc v: v3
1 parent 838c96c commit 3d088eb

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: 5d360050666ef6c884fbf9b7eec1f3da9f0d13bf
2+
refs/heads/master: 704f11d3d8a066eb5e8bb869af07fa33de530cc8
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: afdfe40aa0b7dfc7800dddbc1f55da979abfe486
55
refs/heads/try: 77f72d36ecd447877634d8e5c54b8d793e34cefa

trunk/src/doc/tutorial.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -469,7 +469,7 @@ fn signum(x: int) -> int {
469469

470470
Rust's `match` construct is a generalized, cleaned-up version of C's
471471
`switch` construct. You provide it with a value and a number of
472-
*arms*, each labelled with a pattern, and the code compares the value
472+
*arms*, each labeled with a pattern, and the code compares the value
473473
against each pattern in order until one matches. The matching pattern
474474
executes its corresponding arm.
475475

@@ -2524,7 +2524,7 @@ of the components of types. By design, trait objects don't know the exact type
25242524
of their contents and so the compiler cannot reason about those properties.
25252525

25262526
You can instruct the compiler, however, that the contents of a trait object must
2527-
acribe to a particular bound with a trailing colon (`:`). These are examples of
2527+
ascribe to a particular bound with a trailing colon (`:`). These are examples of
25282528
valid types:
25292529

25302530
~~~rust
@@ -2579,7 +2579,7 @@ This is a silly way to compute the radius of a circle
25792579

25802580
In type-parameterized functions,
25812581
methods of the supertrait may be called on values of subtrait-bound type parameters.
2582-
Refering to the previous example of `trait Circle : Shape`:
2582+
Referring to the previous example of `trait Circle : Shape`:
25832583

25842584
~~~
25852585
# trait Shape { fn area(&self) -> f64; }

0 commit comments

Comments
 (0)