Skip to content

Commit 558d421

Browse files
committed
---
yaml --- r: 231908 b: refs/heads/auto c: 5c56887 h: refs/heads/master v: v3
1 parent 6d09936 commit 558d421

File tree

13 files changed

+2219
-206
lines changed

13 files changed

+2219
-206
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
88
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
99
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1010
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
11-
refs/heads/auto: 9ac36f46650d0f4d92b5111688d2fb84a50d591f
11+
refs/heads/auto: 5c56887903bec6e1a638f8bdcfe2f22ec0fd000a
1212
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1313
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336
1414
refs/tags/0.2: 1754d02027f2924bed83b0160ee340c7f41d5ea1

branches/auto/configure

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -978,7 +978,7 @@ then
978978
LLVM_VERSION=$($LLVM_CONFIG --version)
979979

980980
case $LLVM_VERSION in
981-
(3.[5-7]*)
981+
(3.[5-8]*)
982982
msg "found ok version of LLVM: $LLVM_VERSION"
983983
;;
984984
(*)
@@ -1052,7 +1052,7 @@ then
10521052
esac
10531053
else
10541054
case $CFG_CLANG_VERSION in
1055-
(3.2* | 3.3* | 3.4* | 3.5* | 3.6* | 3.7*)
1055+
(3.2* | 3.3* | 3.4* | 3.5* | 3.6* | 3.7* | 3.8*)
10561056
step_msg "found ok version of CLANG: $CFG_CLANG_VERSION"
10571057
;;
10581058
(*)

branches/auto/src/doc/reference.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1489,14 +1489,14 @@ impl Num for f64 {
14891489
let x: f64 = Num::from_i32(42);
14901490
```
14911491

1492-
Traits may inherit from other traits. For example, in
1492+
Traits may inherit from other traits. Consider the following example:
14931493

14941494
```
14951495
trait Shape { fn area(&self) -> f64; }
14961496
trait Circle : Shape { fn radius(&self) -> f64; }
14971497
```
14981498

1499-
the syntax `Circle : Shape` means that types that implement `Circle` must also
1499+
The syntax `Circle : Shape` means that types that implement `Circle` must also
15001500
have an implementation for `Shape`. Multiple supertraits are separated by `+`,
15011501
`trait Circle : Shape + PartialEq { }`. In an implementation of `Circle` for a
15021502
given type `T`, methods can refer to `Shape` methods, since the typechecker

0 commit comments

Comments
 (0)