diff options
| author | bors <bors@rust-lang.org> | 2015-09-10 13:44:48 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-09-10 13:44:48 +0000 |
| commit | 9577e426824d410e21147bec73b1c7d0a64f890d (patch) | |
| tree | 70bf7d57d3242083dbb8ad12a8b817e27080306d | |
| parent | 5f9f0b7cc34141a661822e67a3f05beef27f20dd (diff) | |
| parent | c5a76c692b68748384214002bdfdff2e93658694 (diff) | |
| download | rust-9577e426824d410e21147bec73b1c7d0a64f890d.tar.gz rust-9577e426824d410e21147bec73b1c7d0a64f890d.zip | |
Auto merge of #28329 - tshepang:comfort, r=steveklabnik
| -rw-r--r-- | src/doc/reference.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/doc/reference.md b/src/doc/reference.md index 6d04a7dcb08..e1bb83aa156 100644 --- a/src/doc/reference.md +++ b/src/doc/reference.md @@ -1489,14 +1489,14 @@ impl Num for f64 { let x: f64 = Num::from_i32(42); ``` -Traits may inherit from other traits. For example, in +Traits may inherit from other traits. Consider the following example: ``` trait Shape { fn area(&self) -> f64; } trait Circle : Shape { fn radius(&self) -> f64; } ``` -the syntax `Circle : Shape` means that types that implement `Circle` must also +The syntax `Circle : Shape` means that types that implement `Circle` must also have an implementation for `Shape`. Multiple supertraits are separated by `+`, `trait Circle : Shape + PartialEq { }`. In an implementation of `Circle` for a given type `T`, methods can refer to `Shape` methods, since the typechecker |