Skip to content

Commit 403ccc1

Browse files
committed
---
yaml --- r: 147131 b: refs/heads/try2 c: a44852a h: refs/heads/master i: 147129: 24271ff 147127: 1e6ca9f v: v3
1 parent 8115da1 commit 403ccc1

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
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
55
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: 888144c98d43d62e839307219346398660ddf546
8+
refs/heads/try2: a44852a2d5ac12545a3c1b55dab1c3d4070872a1
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

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