From e3d59da253839b27137fccb9c5496d5973948fc4 Mon Sep 17 00:00:00 2001 From: Natasha Moongrave Date: Mon, 30 Mar 2026 14:43:17 +0200 Subject: add allocator as a dependency --- .cargo/config.toml | 2 +- StrixKernel/Cargo.lock | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/.cargo/config.toml b/.cargo/config.toml index c728a17..18b89e2 100644 --- a/.cargo/config.toml +++ b/.cargo/config.toml @@ -1,6 +1,6 @@ [unstable] json-target-spec = true -build-std = ["core", "compiler_builtins"] +build-std = ["core", "compiler_builtins", "alloc"] build-std-features = ["compiler-builtins-mem"] [build] diff --git a/StrixKernel/Cargo.lock b/StrixKernel/Cargo.lock index 33b2149..4babadf 100644 --- a/StrixKernel/Cargo.lock +++ b/StrixKernel/Cargo.lock @@ -35,6 +35,24 @@ dependencies = [ "spin 0.9.8", ] +[[package]] +name = "linked_list_allocator" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "549ce1740e46b291953c4340adcd74c59bcf4308f4cac050fd33ba91b7168f4a" +dependencies = [ + "spinning_top", +] + +[[package]] +name = "lock_api" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "224399e74b87b5f3557511d98dff8b14089b3dadafcab6bb93eab67d3aace965" +dependencies = [ + "scopeguard", +] + [[package]] name = "pc-keyboard" version = "0.7.0" @@ -56,6 +74,12 @@ version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + [[package]] name = "spin" version = "0.5.2" @@ -68,12 +92,22 @@ version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +[[package]] +name = "spinning_top" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b9eb1a2f4c41445a3a0ff9abc5221c5fcd28e1f13cd7c0397706f9ac938ddb0" +dependencies = [ + "lock_api", +] + [[package]] name = "strix_os" version = "0.1.0" dependencies = [ "bootloader", "lazy_static", + "linked_list_allocator", "pc-keyboard", "pic8259", "spin 0.5.2", -- cgit v1.2.3