about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-08-30 23:51:25 +0000
committerbors <bors@rust-lang.org>2014-08-30 23:51:25 +0000
commitc2564540de933c2dfe48cc72f947b29853ab2803 (patch)
tree1ed3427cb56e92ecbb5c442ec4162856cfff20d3
parent23c1f9b3c278778d79964de3362028ca01f7ee0c (diff)
parent666d566eec4a41083f9ff85b04a2f3456989b722 (diff)
downloadrust-c2564540de933c2dfe48cc72f947b29853ab2803.tar.gz
rust-c2564540de933c2dfe48cc72f947b29853ab2803.zip
auto merge of #16393 : SimonSapin/rust/patch-9, r=steveklabnik
-rw-r--r--src/doc/guide-ffi.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/doc/guide-ffi.md b/src/doc/guide-ffi.md
index 294cae3a1f7..dd35a610e15 100644
--- a/src/doc/guide-ffi.md
+++ b/src/doc/guide-ffi.md
@@ -528,8 +528,8 @@ the `libc` module, and Rust links against `libc` and `libm` by default.
 # The "nullable pointer optimization"
 
 Certain types are defined to not be `null`. This includes references (`&T`,
-`&mut T`), owning pointers (`~T`), and function pointers (`extern "abi"
-fn()`). When interfacing with C, pointers that might be null are often used.
+`&mut T`), boxes (`Box<T>`), and function pointers (`extern "abi" fn()`).
+When interfacing with C, pointers that might be null are often used.
 As a special case, a generic `enum` that contains exactly two variants, one of
 which contains no data and the other containing a single field, is eligible
 for the "nullable pointer optimization". When such an enum is instantiated