Skip to content

Commit d1d7097

Browse files
committed
---
yaml --- r: 211898 b: refs/heads/auto c: fd3b6ca h: refs/heads/master v: v3
1 parent 25d904d commit d1d7097

File tree

2 files changed

+18
-17
lines changed

2 files changed

+18
-17
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
1010
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1111
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1212
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
13-
refs/heads/auto: 5ef76142439d7ec65acc0e4e2fe56e7fa6476507
13+
refs/heads/auto: fd3b6ca508ed99004a11291ef1d2c64104102a41
1414
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1515
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1616
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/src/doc/reference.md

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3699,28 +3699,29 @@ Coercion is allowed between the following types:
36993699
* `&mut T` to `*mut T`.
37003700

37013701
* `&T` to `&U` if `T` implements `Deref<Target = U>`. For example:
3702-
```
3703-
use std::ops::Deref;
37043702

3705-
struct CharContainer {
3706-
value: char
3707-
}
3703+
```rust
3704+
use std::ops::Deref;
37083705

3709-
impl Deref for CharContainer {
3710-
type Target = char;
3706+
struct CharContainer {
3707+
value: char
3708+
}
37113709

3712-
fn deref<'a>(&'a self) -> &'a char {
3713-
&self.value
3714-
}
3710+
impl Deref for CharContainer {
3711+
type Target = char;
3712+
3713+
fn deref<'a>(&'a self) -> &'a char {
3714+
&self.value
37153715
}
3716+
}
37163717

3717-
fn foo(arg: &char) {}
3718+
fn foo(arg: &char) {}
37183719

3719-
fn main() {
3720-
let x = &mut CharContainer { value: 'y' };
3721-
foo(x); //&mut CharContainer is coerced to &char.
3722-
}
3723-
```
3720+
fn main() {
3721+
let x = &mut CharContainer { value: 'y' };
3722+
foo(x); //&mut CharContainer is coerced to &char.
3723+
}
3724+
```
37243725
* `&mut T` to `&mut U` if `T` implements `DerefMut<Target = U>`.
37253726

37263727
* TyCtor(`T`) to TyCtor(coerce_inner(`T`)), where TyCtor(`T`) is one of

0 commit comments

Comments
 (0)