diff options
| author | Dylan DPC <dylan.dpc@gmail.com> | 2020-04-30 20:15:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-30 20:15:28 +0200 |
| commit | 97a8870022ec819c8b92b4c192242726c77e19f3 (patch) | |
| tree | 03560a70ca5e38fced3b468d9320d33f5811b28e /src/liballoc | |
| parent | 2770f820aa770080770df2b29c03113e14f5bdc8 (diff) | |
| parent | eda7f8fdff16aee5ff30b150555c479f885ba993 (diff) | |
| download | rust-97a8870022ec819c8b92b4c192242726c77e19f3.tar.gz rust-97a8870022ec819c8b92b4c192242726c77e19f3.zip | |
Rollup merge of #71597 - CohenArthur:refactor-unique-empty, r=shepmaster
Rename Unique::empty() -> Unique::dangling() A `FIXME` comment in `src/libcore/ptr/unique.rs` suggested refactoring `Unique::empty()` to `Unique::dangling()` which this PR does.
Diffstat (limited to 'src/liballoc')
| -rw-r--r-- | src/liballoc/raw_vec.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/liballoc/raw_vec.rs b/src/liballoc/raw_vec.rs index ca165b61e26..a8e19c9cbaa 100644 --- a/src/liballoc/raw_vec.rs +++ b/src/liballoc/raw_vec.rs @@ -25,9 +25,9 @@ mod tests; /// involved. This type is excellent for building your own data structures like Vec and VecDeque. /// In particular: /// -/// * Produces `Unique::empty()` on zero-sized types. -/// * Produces `Unique::empty()` on zero-length allocations. -/// * Avoids freeing `Unique::empty()`. +/// * Produces `Unique::dangling()` on zero-sized types. +/// * Produces `Unique::dangling()` on zero-length allocations. +/// * Avoids freeing `Unique::dangling()`. /// * Catches all overflows in capacity computations (promotes them to "capacity overflow" panics). /// * Guards against 32-bit systems allocating more than isize::MAX bytes. /// * Guards against overflowing your length. @@ -125,7 +125,7 @@ impl<T, A: AllocRef> RawVec<T, A> { /// the returned `RawVec`. pub const fn new_in(alloc: A) -> Self { // `cap: 0` means "unallocated". zero-sized types are ignored. - Self { ptr: Unique::empty(), cap: 0, alloc } + Self { ptr: Unique::dangling(), cap: 0, alloc } } /// Like `with_capacity`, but parameterized over the choice of @@ -172,7 +172,7 @@ impl<T, A: AllocRef> RawVec<T, A> { } /// Gets a raw pointer to the start of the allocation. Note that this is - /// `Unique::empty()` if `capacity == 0` or `T` is zero-sized. In the former case, you must + /// `Unique::dangling()` if `capacity == 0` or `T` is zero-sized. In the former case, you must /// be careful. pub fn ptr(&self) -> *mut T { self.ptr.as_ptr() |
