Merge branch 'main' of https://github.com/wenyuzhao/MallocKit

wenyuzhao · May 23, 2024 · 2046ddc · 2046ddc
2 parents 7c4db9f + 7ff89cf
commit 2046ddc
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 9 deletions.
diff --git a/buddy/Cargo.toml b/buddy/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "buddy"
 version = { workspace = true }
-authors = ["Wenyu Zhao <wenyu.zhao@anu.edu.au>"]
+authors = ["Wenyu Zhao <wenyuzhaox@gmail.com>"]
 edition = { workspace = true }
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

diff --git a/bump/Cargo.toml b/bump/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "bump"
 version = { workspace = true }
-authors = ["Wenyu Zhao <wenyu.zhao@anu.edu.au>"]
+authors = ["Wenyu Zhao <wenyuzhaox@gmail.com>"]
 edition = { workspace = true }
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

diff --git a/hoard/Cargo.toml b/hoard/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "hoard"
 version = { workspace = true }
-authors = ["Wenyu Zhao <wenyu.zhao@anu.edu.au>"]
+authors = ["Wenyu Zhao <wenyuzhaox@gmail.com>"]
 edition = { workspace = true }
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

diff --git a/mallockit/Cargo.toml b/mallockit/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "mallockit"
 version = { workspace = true }
-authors = ["Wenyu Zhao <wenyu.zhao@anu.edu.au>"]
+authors = ["Wenyu Zhao <wenyuzhaox@gmail.com>"]
 edition = { workspace = true }
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

diff --git a/mallockit/macros/Cargo.toml b/mallockit/macros/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "mallockit-macros"
 version = { workspace = true }
-authors = ["Wenyu Zhao <wenyu.zhao@anu.edu.au>"]
+authors = ["Wenyu Zhao <wenyuzhaox@gmail.com>"]
 edition = { workspace = true }
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

diff --git a/mallockit/src/util/constants.rs b/mallockit/src/util/constants.rs
@@ -2,9 +2,11 @@
     target_os = "macos",
     all(target_os = "windows", target_pointer_width = "64")
 )))]
-pub const MIN_ALIGNMENT: usize = 16; // should be 8?
+pub const LOG_MIN_ALIGNMENT: usize = 4; // should be 8?
 #[cfg(any(
     target_os = "macos",
     all(target_os = "windows", target_pointer_width = "64")
 ))]
-pub const MIN_ALIGNMENT: usize = 16;
+pub const LOG_MIN_ALIGNMENT: usize = 4;
+
+pub const MIN_ALIGNMENT: usize = 1 << LOG_MIN_ALIGNMENT;
diff --git a/mallockit/src/util/mem/size_class.rs b/mallockit/src/util/mem/size_class.rs
@@ -1,10 +1,12 @@
 use std::alloc::Layout;
 
+use crate::util::constants::LOG_MIN_ALIGNMENT;
+
 use super::layout_utils::LayoutUtils;
 
 #[repr(transparent)]
 #[derive(Debug, Clone, Copy)]
-pub struct SizeClass<const LOG_COVERAGE: u8 = 4>(pub u8);
+pub struct SizeClass<const LOG_COVERAGE: u8 = LOG_MIN_ALIGNMENT>(pub u8);
 
 impl<const LOG_COVERAGE: u8> SizeClass<LOG_COVERAGE> {
     pub const fn as_usize(self) -> usize {

diff --git a/sanity/Cargo.toml b/sanity/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "sanity"
 version = { workspace = true }
-authors = ["Wenyu Zhao <wenyu.zhao@anu.edu.au>"]
+authors = ["Wenyu Zhao <wenyuzhaox@gmail.com>"]
 edition = { workspace = true }
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html