Auto merge of #29018 - tsion:doc-typo, r=steveklabnik

r? @steveklabnik
This commit is contained in:
bors 2015-10-22 13:12:20 +00:00
commit ca998fc2f1

View file

@ -160,7 +160,7 @@ compiler errors:
* Any one artifact may only be linked to at most one allocator. Binaries, * Any one artifact may only be linked to at most one allocator. Binaries,
dylibs, and staticlibs must link to exactly one allocator, and if none have dylibs, and staticlibs must link to exactly one allocator, and if none have
been explicitly chosen the compiler will choose one. On the other than rlibs been explicitly chosen the compiler will choose one. On the other hand rlibs
do not need to link to an allocator (but still can). do not need to link to an allocator (but still can).
* A consumer of an allocator is tagged with `#![needs_allocator]` (e.g. the * A consumer of an allocator is tagged with `#![needs_allocator]` (e.g. the