diff options
| author | bors <bors@rust-lang.org> | 2015-10-22 13:12:20 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-10-22 13:12:20 +0000 |
| commit | ca998fc2f100bce4eab9b4609bd5a0a5c5789872 (patch) | |
| tree | 82f45cbc1eb62703c17ef591cb6235555626fb79 /src | |
| parent | e85b3d84a65be25a85aebac37f10c81002c8f541 (diff) | |
| parent | 0d3d6e40fdb604054ae7a4533e7fa524c3f3fcce (diff) | |
| download | rust-ca998fc2f100bce4eab9b4609bd5a0a5c5789872.tar.gz rust-ca998fc2f100bce4eab9b4609bd5a0a5c5789872.zip | |
Auto merge of #29018 - tsion:doc-typo, r=steveklabnik
r? @steveklabnik
Diffstat (limited to 'src')
| -rw-r--r-- | src/doc/trpl/custom-allocators.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/doc/trpl/custom-allocators.md b/src/doc/trpl/custom-allocators.md index 4fd05e87a7e..c38d0dde511 100644 --- a/src/doc/trpl/custom-allocators.md +++ b/src/doc/trpl/custom-allocators.md @@ -160,7 +160,7 @@ compiler errors: * 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 - 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). * A consumer of an allocator is tagged with `#![needs_allocator]` (e.g. the |