Skip to content

Commit

Permalink
Rollup merge of #60947 - blkerby:global_alloc_typo, r=jonas-schievink
Browse files Browse the repository at this point in the history
Fix typos in docs of GlobalAlloc
  • Loading branch information
Centril authored May 19, 2019
2 parents f9d58c7 + 86cda2d commit 9389c69
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/libcore/alloc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -480,7 +480,7 @@ pub unsafe trait GlobalAlloc {
/// this allocator,
///
/// * `layout` must be the same layout that was used
/// to allocated that block of memory,
/// to allocate that block of memory,
#[stable(feature = "global_alloc", since = "1.28.0")]
unsafe fn dealloc(&self, ptr: *mut u8, layout: Layout);

Expand Down Expand Up @@ -535,7 +535,7 @@ pub unsafe trait GlobalAlloc {
/// * `ptr` must be currently allocated via this allocator,
///
/// * `layout` must be the same layout that was used
/// to allocated that block of memory,
/// to allocate that block of memory,
///
/// * `new_size` must be greater than zero.
///
Expand Down

0 comments on commit 9389c69

Please sign in to comment.