diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2024-02-18 18:54:33 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-18 18:54:33 +0100 |
| commit | c8f2a00aec93e074301ed275ea8827b16a6ab76d (patch) | |
| tree | 102982d44b31289696b3a705e2842e7e2fb40cb8 /library/alloc/src | |
| parent | ddf6c6dbc63adf6ab4c95f3b940fe4e3e510c2f9 (diff) | |
| parent | 6f1383cf5b036236dc7c72ff7bb68401f5e4169a (diff) | |
| download | rust-c8f2a00aec93e074301ed275ea8827b16a6ab76d.tar.gz rust-c8f2a00aec93e074301ed275ea8827b16a6ab76d.zip | |
Rollup merge of #121224 - hi-rustin:rustin-patch-unit-binding, r=Mark-Simulacrum
Remove unnecessary unit binding It appears that the unit binding is not necessary at this time. However, I am unsure of its importance in the past. Please let me know if it is unsafe to remove.
Diffstat (limited to 'library/alloc/src')
| -rw-r--r-- | library/alloc/src/raw_vec.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/library/alloc/src/raw_vec.rs b/library/alloc/src/raw_vec.rs index 49f5f53f9b3..dd8d6f6c7e6 100644 --- a/library/alloc/src/raw_vec.rs +++ b/library/alloc/src/raw_vec.rs @@ -261,7 +261,7 @@ impl<T, A: Allocator> RawVec<T, A> { // and could hypothetically handle differences between stride and size, but this memory // has already been allocated so we know it can't overflow and currently rust does not // support such types. So we can do better by skipping some checks and avoid an unwrap. - let _: () = const { assert!(mem::size_of::<T>() % mem::align_of::<T>() == 0) }; + const { assert!(mem::size_of::<T>() % mem::align_of::<T>() == 0) }; unsafe { let align = mem::align_of::<T>(); let size = mem::size_of::<T>().unchecked_mul(self.cap.0); @@ -465,7 +465,7 @@ impl<T, A: Allocator> RawVec<T, A> { let (ptr, layout) = if let Some(mem) = self.current_memory() { mem } else { return Ok(()) }; // See current_memory() why this assert is here - let _: () = const { assert!(mem::size_of::<T>() % mem::align_of::<T>() == 0) }; + const { assert!(mem::size_of::<T>() % mem::align_of::<T>() == 0) }; // If shrinking to 0, deallocate the buffer. We don't reach this point // for the T::IS_ZST case since current_memory() will have returned |
