Rollup merge of #43891 - Fourchaux:master, r=steveklabnik
Fix typos & us spellings Fixing some typos and non en-US spellings. (Update of PR https://github.com/rust-lang/rust/pull/42812 )
This commit is contained in:
@@ -293,7 +293,7 @@ impl Layout {
|
||||
/// Creates a layout describing the record for `self` followed by
|
||||
/// `next` with no additional padding between the two. Since no
|
||||
/// padding is inserted, the alignment of `next` is irrelevant,
|
||||
/// and is not incoporated *at all* into the resulting layout.
|
||||
/// and is not incorporated *at all* into the resulting layout.
|
||||
///
|
||||
/// Returns `(k, offset)`, where `k` is layout of the concatenated
|
||||
/// record and `offset` is the relative location, in bytes, of the
|
||||
@@ -528,7 +528,7 @@ pub unsafe trait Alloc {
|
||||
/// to allocate that block of memory.
|
||||
unsafe fn dealloc(&mut self, ptr: *mut u8, layout: Layout);
|
||||
|
||||
/// Allocator-specific method for signalling an out-of-memory
|
||||
/// Allocator-specific method for signaling an out-of-memory
|
||||
/// condition.
|
||||
///
|
||||
/// `oom` aborts the thread or process, optionally performing
|
||||
@@ -539,7 +539,7 @@ pub unsafe trait Alloc {
|
||||
/// unsatisfied allocation request (signaled by an error such as
|
||||
/// `AllocErr::Exhausted`), and wish to abandon computation rather
|
||||
/// than attempt to recover locally. Such clients should pass the
|
||||
/// signalling error value back into `oom`, where the allocator
|
||||
/// signaling error value back into `oom`, where the allocator
|
||||
/// may incorporate that error value into its diagnostic report
|
||||
/// before aborting.
|
||||
///
|
||||
|
||||
@@ -763,7 +763,7 @@ impl<Node: Copy, Type> Clone for Handle<Node, Type> {
|
||||
}
|
||||
|
||||
impl<Node, Type> Handle<Node, Type> {
|
||||
/// Retrieves the node that contains the edge of key/value pair this handle pointes to.
|
||||
/// Retrieves the node that contains the edge of key/value pair this handle points to.
|
||||
pub fn into_node(self) -> Node {
|
||||
self.node
|
||||
}
|
||||
|
||||
@@ -544,12 +544,12 @@ impl<T, A: Alloc> RawVec<T, A> {
|
||||
/// Attempts to ensure that the buffer contains at least enough space to hold
|
||||
/// `used_cap + needed_extra_cap` elements. If it doesn't already have
|
||||
/// enough capacity, will reallocate in place enough space plus comfortable slack
|
||||
/// space to get amortized `O(1)` behaviour. Will limit this behaviour
|
||||
/// space to get amortized `O(1)` behavior. Will limit this behaviour
|
||||
/// if it would needlessly cause itself to panic.
|
||||
///
|
||||
/// If `used_cap` exceeds `self.cap()`, this may fail to actually allocate
|
||||
/// the requested space. This is not really unsafe, but the unsafe
|
||||
/// code *you* write that relies on the behaviour of this function may break.
|
||||
/// code *you* write that relies on the behavior of this function may break.
|
||||
///
|
||||
/// Returns true if the reallocation attempt has succeeded, or false otherwise.
|
||||
///
|
||||
|
||||
Reference in New Issue
Block a user