---

yaml
---
r: 49140
b: refs/heads/snap-stage3
c: d98a195
h: refs/heads/master
v: v3

Author: bors

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 3bbcac322669cff3abde5be937cc4ec3860f3985
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 7a6cd2b21e240d3b075b30d598e661b038fe6fbe
+refs/heads/snap-stage3: d98a195ffc6f68cf071826917e50eb4ad80b270b
 refs/heads/try: 2a8fb58d79e685d5ca07b039badcf2ae3ef077ea
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/doc/tutorial.md

@@ -875,8 +875,7 @@ the compiler that unsafety does not leak outside of the unsafe block, and is
 used to create safe concepts on top of low-level code.
 
 ~~~~
-use core::libc::funcs::c95::stdlib::{calloc, free};
-use core::libc::types::os::arch::c95::size_t;
+use core::libc::{calloc, free, size_t};
 
 fn main() {
     unsafe {
@@ -909,9 +908,7 @@ The unsafe code from above can be contained behind a safe API that prevents
 memory leaks or use-after-free:
 
 ~~~~
-use core::libc::funcs::c95::stdlib::{calloc, free};
-use core::libc::types::common::c95::c_void;
-use core::libc::types::os::arch::c95::size_t;
+use core::libc::{calloc, free, c_void, size_t};
 
 struct Blob { priv ptr: *c_void }
 
@@ -985,7 +982,9 @@ when it is collected.
 
 If an object doesn't contain garbage-collected boxes, it consists of a single
 ownership tree and is given the `Owned` trait which allows it to be sent
-between tasks.
+between tasks. Custom destructors can only be implemented directly on types
+that are `Owned`, but garbage-collected boxes can still *contain* types with
+custom destructors.
 
 # Boxes