Skip to content

Commit 547fab9

Browse files
froydnjalexcrichton
authored andcommitted
---
yaml --- r: 153062 b: refs/heads/try2 c: 704f11d h: refs/heads/master v: v3
1 parent 62dd0e3 commit 547fab9

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
@@ -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: 5d360050666ef6c884fbf9b7eec1f3da9f0d13bf
8+
refs/heads/try2: 704f11d3d8a066eb5e8bb869af07fa33de530cc8
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/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)