Skip to content

Commit 876d62a

Browse files
committed
---
yaml --- r: 35675 b: refs/heads/master c: d098faa h: refs/heads/master i: 35673: e06e163 35671: 24c4cd0 v: v3
1 parent 22d0931 commit 876d62a

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-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: 21c9d0858b1ee0c6fe508a9eb1d229713a2649e4
2+
refs/heads/master: d098faa8555d48a9bc1de34542fc6d1dd5a2ab9c
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: eb8fd119c65c67f3b1b8268cc7341c22d39b7b61
55
refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024

trunk/doc/tutorial.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2127,15 +2127,15 @@ This usage of traits is similar to Java interfaces.
21272127

21282128
We can write a trait declaration that _inherits_ from other traits, called _supertraits_.
21292129
Types that implement a trait must also implement its supertraits.
2130-
2131-
For example, we can define a `Circle` trait that only types that also have the `Shape` trait can have:
2130+
For example,
2131+
we can define a `Circle` trait that inherits from `Shape`.
21322132

21332133
~~~~
21342134
trait Shape { fn area(&self) -> float; }
21352135
trait Circle : Shape { fn radius(&self) -> float; }
21362136
~~~~
21372137

2138-
Now, implementations of `Circle` methods can call `Shape` methods:
2138+
Now, we can implement `Circle` on a type only if we also implement `Shape`.
21392139

21402140
~~~~
21412141
# trait Shape { fn area(&self) -> float; }
@@ -2153,6 +2153,8 @@ impl CircleStruct: Shape {
21532153
}
21542154
~~~~
21552155

2156+
Notice that methods of `Circle` can call methods on `Shape`, as our
2157+
`radius` implementation calls the `area` method.
21562158
This is a silly way to compute the radius of a circle
21572159
(since we could just return the `circle` field), but you get the idea.
21582160

0 commit comments

Comments
 (0)