diff options
| author | bors <bors@rust-lang.org> | 2017-08-13 10:22:45 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-08-13 10:22:45 +0000 |
| commit | a80a873209a79499290201f8657618703a51b73e (patch) | |
| tree | 7cc9023e2d308290a6d242bd5a147e63111193c2 /src/liballoc/allocator.rs | |
| parent | d4fbc7a4e781a211b19fa2154184b37d3d53d32b (diff) | |
| parent | a7ead41aecfdd591bbb552eb007708be2c0919de (diff) | |
| download | rust-a80a873209a79499290201f8657618703a51b73e.tar.gz rust-a80a873209a79499290201f8657618703a51b73e.zip | |
Auto merge of #43839 - GuillaumeGomez:rollup, r=GuillaumeGomez
Rollup of 8 pull requests - Successful merges: #43782, #43803, #43814, #43819, #43821, #43822, #43824, #43833 - Failed merges:
Diffstat (limited to 'src/liballoc/allocator.rs')
| -rw-r--r-- | src/liballoc/allocator.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/liballoc/allocator.rs b/src/liballoc/allocator.rs index 3ea7d349c9c..7b6700bfd49 100644 --- a/src/liballoc/allocator.rs +++ b/src/liballoc/allocator.rs @@ -240,7 +240,7 @@ impl Layout { /// /// Returns `Some((k, offset))`, where `k` is layout of the concatenated /// record and `offset` is the relative location, in bytes, of the - /// start of the `next` embedded witnin the concatenated record + /// start of the `next` embedded within the concatenated record /// (assuming that the record itself starts at offset 0). /// /// On arithmetic overflow, returns `None`. @@ -297,7 +297,7 @@ impl Layout { /// /// Returns `(k, offset)`, where `k` is layout of the concatenated /// record and `offset` is the relative location, in bytes, of the - /// start of the `next` embedded witnin the concatenated record + /// start of the `next` embedded within the concatenated record /// (assuming that the record itself starts at offset 0). /// /// (The `offset` is always the same as `self.size()`; we use this @@ -544,7 +544,7 @@ pub unsafe trait Alloc { /// practice this means implementors should eschew allocating, /// especially from `self` (directly or indirectly). /// - /// Implementions of the allocation and reallocation methods + /// Implementations of the allocation and reallocation methods /// (e.g. `alloc`, `alloc_one`, `realloc`) are discouraged from /// panicking (or aborting) in the event of memory exhaustion; /// instead they should return an appropriate error from the |
