Skip to content

Commit bbf1186

Browse files
committed
---
yaml --- r: 51110 b: refs/heads/try c: d98a195 h: refs/heads/master v: v3
1 parent 21e97ad commit bbf1186

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
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: 5f13e9ccc2e3328d4cd8ca49f84e6840dd998346
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: f7a2371c176663d59062ec5158f39faecba45768
5-
refs/heads/try: b05e148dc954d7c1fb4666d4529653993a93eb1d
5+
refs/heads/try: d98a195ffc6f68cf071826917e50eb4ad80b270b
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/doc/tutorial.md

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -875,8 +875,7 @@ the compiler that unsafety does not leak outside of the unsafe block, and is
875875
used to create safe concepts on top of low-level code.
876876

877877
~~~~
878-
use core::libc::funcs::c95::stdlib::{calloc, free};
879-
use core::libc::types::os::arch::c95::size_t;
878+
use core::libc::{calloc, free, size_t};
880879
881880
fn main() {
882881
unsafe {
@@ -909,9 +908,7 @@ The unsafe code from above can be contained behind a safe API that prevents
909908
memory leaks or use-after-free:
910909

911910
~~~~
912-
use core::libc::funcs::c95::stdlib::{calloc, free};
913-
use core::libc::types::common::c95::c_void;
914-
use core::libc::types::os::arch::c95::size_t;
911+
use core::libc::{calloc, free, c_void, size_t};
915912
916913
struct Blob { priv ptr: *c_void }
917914
@@ -985,7 +982,9 @@ when it is collected.
985982

986983
If an object doesn't contain garbage-collected boxes, it consists of a single
987984
ownership tree and is given the `Owned` trait which allows it to be sent
988-
between tasks.
985+
between tasks. Custom destructors can only be implemented directly on types
986+
that are `Owned`, but garbage-collected boxes can still *contain* types with
987+
custom destructors.
989988

990989
# Boxes
991990

0 commit comments

Comments
 (0)