Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix typos in src/libcore/alloc.rs docs #67154

Merged
merged 5 commits into from
Dec 11, 2019
Merged

Fix typos in src/libcore/alloc.rs docs #67154

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
76d3003
Change "result" to "resulting" in `Layout::extend`'s docs
kraai Dec 6, 2019
852be72
Change "though" to "through" in `Alloc`'s docs
kraai Dec 6, 2019
b2392fd
Add "this" to `GlobalAlloc::alloc`'s docs
kraai Dec 6, 2019
cca954e
Change "`alloc`/`realloc`" to "`realloc/dealloc`"
kraai Dec 8, 2019
9e8505d
Change "attributes" to "attribute" in `Alloc`'s docs
kraai Dec 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/libcore/alloc.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ impl Layout {

/// Creates a layout describing the record for `self` followed by
/// `next`, including any necessary padding to ensure that `next`
/// will be properly aligned. Note that the result layout will
/// will be properly aligned. Note that the resulting layout will
/// satisfy the alignment properties of both `self` and `next`.
///
/// The resulting layout will be the same as that of a C struct containing
Expand Down Expand Up @@ -388,7 +388,7 @@ impl fmt::Display for CannotReallocInPlace {
}

/// A memory allocator that can be registered as the standard library’s default
/// though the `#[global_allocator]` attributes.
/// through the `#[global_allocator]` attribute.
///
/// Some of the methods require that a memory block be *currently
/// allocated* via an allocator. This means that:
Expand Down Expand Up @@ -459,7 +459,7 @@ pub unsafe trait GlobalAlloc {
/// # Errors
///
/// Returning a null pointer indicates that either memory is exhausted
/// or `layout` does not meet allocator's size or alignment constraints.
/// or `layout` does not meet this allocator's size or alignment constraints.
///
/// Implementations are encouraged to return null on memory
/// exhaustion rather than aborting, but this is not
Expand Down Expand Up @@ -1046,7 +1046,7 @@ pub unsafe trait Alloc {
/// Captures a common usage pattern for allocators.
///
/// The returned block is suitable for passing to the
/// `alloc`/`realloc` methods of this allocator.
/// `realloc`/`dealloc` methods of this allocator.
///
/// Note to implementors: If this returns `Ok(ptr)`, then `ptr`
/// must be considered "currently allocated" and must be
Expand Down Expand Up @@ -1112,7 +1112,7 @@ pub unsafe trait Alloc {
/// Captures a common usage pattern for allocators.
///
/// The returned block is suitable for passing to the
/// `alloc`/`realloc` methods of this allocator.
/// `realloc`/`dealloc` methods of this allocator.
///
/// Note to implementors: If this returns `Ok(ptr)`, then `ptr`
/// must be considered "currently allocated" and must be
Expand Down Expand Up @@ -1159,7 +1159,7 @@ pub unsafe trait Alloc {
/// Captures a common usage pattern for allocators.
///
/// The returned block is suitable for passing to the
/// `alloc`/`realloc` methods of this allocator.
/// `realloc`/`dealloc` methods of this allocator.
///
/// # Safety
///
Expand Down