Skip to content

Commit 9cef0ec

Browse files
committed
---
yaml --- r: 94179 b: refs/heads/try c: a44852a h: refs/heads/master i: 94177: 7b46d75 94175: 84092da v: v3
1 parent c934f0f commit 9cef0ec

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
@@ -2,7 +2,7 @@
22
refs/heads/master: 0da105a8b7b6b1e0568e8ff20f6ff4b13cc7ecc2
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: a6d3e57dca68fde4effdda3e4ae2887aa535fcd6
5-
refs/heads/try: 888144c98d43d62e839307219346398660ddf546
5+
refs/heads/try: a44852a2d5ac12545a3c1b55dab1c3d4070872a1
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/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)