Skip to content

Commit 4cda1fd

Browse files
committed
---
yaml --- r: 224526 b: refs/heads/beta c: 3f8e029 h: refs/heads/master v: v3
1 parent c82e76f commit 4cda1fd

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ refs/tags/0.9: 36870b185fc5f5486636d4515f0e22677493f225
2323
refs/tags/0.10: ac33f2b15782272ae348dbd7b14b8257b2148b5a
2424
refs/tags/0.11.0: e1247cb1d0d681be034adb4b558b5a0c0d5720f9
2525
refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
26-
refs/heads/beta: 5f02de3c226bce60c58ce2bc436e69c55b90a616
26+
refs/heads/beta: 3f8e029bedba23b8b2d174fac2718f970a396676
2727
refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
2828
refs/heads/tmp: 938f5d7af401e2d8238522fed4a612943b6e77fd
2929
refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f

branches/beta/src/doc/tarpl/coercions.md

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
% Coercions
22

33
Types can implicitly be coerced to change in certain contexts. These changes are
4-
generally just *weakening* of types, largely focused around pointers and lifetimes.
5-
They mostly exist to make Rust "just work" in more cases, and are largely harmless.
4+
generally just *weakening* of types, largely focused around pointers and
5+
lifetimes. They mostly exist to make Rust "just work" in more cases, and are
6+
largely harmless.
67

78
Here's all the kinds of coercion:
89

9-
1010
Coercion is allowed between the following types:
1111

12-
* Subtyping: `T` to `U` if `T` is a [subtype][] of `U`
13-
* Transitivity: `T_1` to `T_3` where `T_1` coerces to `T_2` and `T_2` coerces to `T_3`
12+
* Transitivity: `T_1` to `T_3` where `T_1` coerces to `T_2` and `T_2` coerces to
13+
`T_3`
1414
* Pointer Weakening:
1515
* `&mut T` to `&T`
1616
* `*mut T` to `*const T`
@@ -68,5 +68,3 @@ fn main() {
6868
<anon>:10 foo(t);
6969
^~~
7070
```
71-
72-
[subtype]: subtyping.html

0 commit comments

Comments
 (0)