Skip to content

Commit 7221210

Browse files
committed
---
yaml --- r: 90344 b: refs/heads/master c: a44852a h: refs/heads/master v: v3
1 parent 2ce7815 commit 7221210

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
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: 888144c98d43d62e839307219346398660ddf546
2+
refs/heads/master: a44852a2d5ac12545a3c1b55dab1c3d4070872a1
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: a6d3e57dca68fde4effdda3e4ae2887aa535fcd6
55
refs/heads/try: b160761e35efcd1207112b3b782c06633cf441a8

trunk/doc/tutorial.md

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -922,11 +922,15 @@ let mut b = Foo { x: 5, y: ~10 };
922922
b.x = 10;
923923
~~~~
924924

925-
If an object doesn't contain garbage-collected boxes, it consists of a single
926-
ownership tree and is given the `Owned` trait which allows it to be sent
925+
If an object doesn't contain any non-Send types, it consists of a single
926+
ownership tree and is itself given the `Send` trait which allows it to be sent
927927
between tasks. Custom destructors can only be implemented directly on types
928-
that are `Owned`, but garbage-collected boxes can still *contain* types with
929-
custom destructors.
928+
that are `Send`, but non-`Send` types can still *contain* types with custom
929+
destructors. Example of types which are not `Send` are [`Gc<T>`][gc] and
930+
[`Rc<T>`][rc], the shared-ownership types.
931+
932+
[gc]: http://static.rust-lang.org/doc/master/std/gc/struct.Gc.html
933+
[rc]: http://static.rust-lang.org/doc/master/std/rc/struct.Rc.html
930934

931935
# Implementing a linked list
932936

0 commit comments

Comments
 (0)