From 49bf92a7aaf10a4777ea512303e442588f4ce2e5 Mon Sep 17 00:00:00 2001
From: Nathan Ringo <nathan@remexre.com>
Date: Sun, 15 Sep 2024 03:25:30 -0500
Subject: Start of serious allocator work.

---
 crates/Cargo.lock | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

(limited to 'crates/Cargo.lock')

diff --git a/crates/Cargo.lock b/crates/Cargo.lock
index 41dfbb3..63385f0 100644
--- a/crates/Cargo.lock
+++ b/crates/Cargo.lock
@@ -94,12 +94,6 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
 
-[[package]]
-name = "ghost-cell"
-version = "0.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8449d342b1c67f49169e92e71deb7b9b27f30062301a16dbc27a4cc8d2351b7"
-
 [[package]]
 name = "lazy_static"
 version = "1.5.0"
@@ -314,10 +308,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
 
 [[package]]
-name = "static-rc"
-version = "0.6.1"
+name = "sptr"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b91d0104a7b28aeda24b30919f83222570111ac0bf1aab23aaffb8f59330e654"
+checksum = "3b9b39299b249ad65f3b7e96443bad61c02ca5cd3589f46cb6d610a0fd6c0d6a"
+
+[[package]]
+name = "static_assertions"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
 
 [[package]]
 name = "syn"
@@ -354,6 +354,9 @@ version = "0.1.0"
 dependencies = [
  "allocator-api2",
  "contracts",
+ "log",
+ "sptr",
+ "static_assertions",
 ]
 
 [[package]]
@@ -370,8 +373,6 @@ version = "0.1.0"
 dependencies = [
  "allocator-api2",
  "contracts",
- "ghost-cell",
- "static-rc",
  "vernos_utils",
 ]
 
@@ -401,7 +402,9 @@ dependencies = [
  "either",
  "log",
  "spin",
+ "static_assertions",
  "vernos_alloc_buddy",
+ "vernos_alloc_genmalloc",
  "vernos_alloc_physmem_free_list",
  "vernos_alloc_vma_tree",
  "vernos_device_tree",
-- 
cgit v1.2.3