diff options
Diffstat (limited to 'crates')
| -rw-r--r-- | crates/Cargo.lock | 6 | ||||
| -rw-r--r-- | crates/Cargo.toml | 2 | ||||
| -rw-r--r-- | crates/alloc_buddy/Cargo.toml (renamed from crates/buddy_allocator/Cargo.toml) | 4 | ||||
| -rw-r--r-- | crates/alloc_buddy/src/bitvec.rs (renamed from crates/buddy_allocator/src/bitvec.rs) | 0 | ||||
| -rw-r--r-- | crates/alloc_buddy/src/free_list.rs (renamed from crates/buddy_allocator/src/free_list.rs) | 0 | ||||
| -rw-r--r-- | crates/alloc_buddy/src/lib.rs (renamed from crates/buddy_allocator/src/lib.rs) | 2 | ||||
| -rw-r--r-- | crates/alloc_buddy/src/tree.rs (renamed from crates/buddy_allocator/src/tree.rs) | 0 | ||||
| -rw-r--r-- | crates/alloc_buddy/tests/hosted_test.rs (renamed from crates/buddy_allocator/tests/hosted_test.rs) | 4 | ||||
| -rw-r--r-- | crates/alloc_physmem_free_list/Cargo.toml (renamed from crates/physmem_free_list/Cargo.toml) | 2 | ||||
| -rw-r--r-- | crates/alloc_physmem_free_list/src/lib.rs (renamed from crates/physmem_free_list/src/lib.rs) | 0 |
10 files changed, 10 insertions, 10 deletions
diff --git a/crates/Cargo.lock b/crates/Cargo.lock index 33f18cf..62c6ae4 100644 --- a/crates/Cargo.lock +++ b/crates/Cargo.lock @@ -298,7 +298,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] -name = "vernos_buddy_allocator" +name = "vernos_alloc_buddy" version = "0.1.0" dependencies = [ "allocator-api2", @@ -306,11 +306,11 @@ dependencies = [ "nix", "proptest", "static_assertions", - "vernos_physmem_free_list", + "vernos_alloc_physmem_free_list", ] [[package]] -name = "vernos_physmem_free_list" +name = "vernos_alloc_physmem_free_list" version = "0.1.0" dependencies = [ "allocator-api2", diff --git a/crates/Cargo.toml b/crates/Cargo.toml index 79760cf..57dd03c 100644 --- a/crates/Cargo.toml +++ b/crates/Cargo.toml @@ -1,3 +1,3 @@ [workspace] -members = ["buddy_allocator", "physmem_free_list"] +members = ["alloc_buddy", "alloc_physmem_free_list"] resolver = "2" diff --git a/crates/buddy_allocator/Cargo.toml b/crates/alloc_buddy/Cargo.toml index 94ab236..5e5c882 100644 --- a/crates/buddy_allocator/Cargo.toml +++ b/crates/alloc_buddy/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "vernos_buddy_allocator" +name = "vernos_alloc_buddy" version = "0.1.0" edition = "2021" publish = false @@ -8,7 +8,7 @@ publish = false allocator-api2 = { version = "0.2.18", default-features = false } contracts = { version = "0.6.3", default-features = false } static_assertions = { version = "1.1.0", default-features = false } -vernos_physmem_free_list = { path = "../physmem_free_list" } +vernos_alloc_physmem_free_list = { path = "../alloc_physmem_free_list" } [dev-dependencies] proptest = { version = "0.9.6", default-features = false, features = ["std"] } diff --git a/crates/buddy_allocator/src/bitvec.rs b/crates/alloc_buddy/src/bitvec.rs index 5cabc5e..5cabc5e 100644 --- a/crates/buddy_allocator/src/bitvec.rs +++ b/crates/alloc_buddy/src/bitvec.rs diff --git a/crates/buddy_allocator/src/free_list.rs b/crates/alloc_buddy/src/free_list.rs index 9b470fd..9b470fd 100644 --- a/crates/buddy_allocator/src/free_list.rs +++ b/crates/alloc_buddy/src/free_list.rs diff --git a/crates/buddy_allocator/src/lib.rs b/crates/alloc_buddy/src/lib.rs index c543ca6..d0d4818 100644 --- a/crates/buddy_allocator/src/lib.rs +++ b/crates/alloc_buddy/src/lib.rs @@ -56,7 +56,7 @@ use crate::{ use allocator_api2::alloc::{AllocError, Layout, LayoutError}; use contracts::{ensures, requires}; use core::{fmt, mem, ptr::NonNull}; -use vernos_physmem_free_list::FreeListAllocator; +use vernos_alloc_physmem_free_list::FreeListAllocator; /// A buddy allocator. pub struct BuddyAllocator< diff --git a/crates/buddy_allocator/src/tree.rs b/crates/alloc_buddy/src/tree.rs index 72ee466..72ee466 100644 --- a/crates/buddy_allocator/src/tree.rs +++ b/crates/alloc_buddy/src/tree.rs diff --git a/crates/buddy_allocator/tests/hosted_test.rs b/crates/alloc_buddy/tests/hosted_test.rs index 0e502b3..1afe263 100644 --- a/crates/buddy_allocator/tests/hosted_test.rs +++ b/crates/alloc_buddy/tests/hosted_test.rs @@ -2,8 +2,8 @@ use core::{fmt, num::NonZero, slice}; use nix::sys::mman::{mmap_anonymous, munmap, MapFlags, ProtFlags}; use proptest::prelude::*; use std::ptr::NonNull; -use vernos_buddy_allocator::BuddyAllocator; -use vernos_physmem_free_list::FreeListAllocator; +use vernos_alloc_buddy::BuddyAllocator; +use vernos_alloc_physmem_free_list::FreeListAllocator; proptest! { #![proptest_config(proptest::test_runner::Config { diff --git a/crates/physmem_free_list/Cargo.toml b/crates/alloc_physmem_free_list/Cargo.toml index c1aadd8..32a210c 100644 --- a/crates/physmem_free_list/Cargo.toml +++ b/crates/alloc_physmem_free_list/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "vernos_physmem_free_list" +name = "vernos_alloc_physmem_free_list" version = "0.1.0" edition = "2021" publish = false diff --git a/crates/physmem_free_list/src/lib.rs b/crates/alloc_physmem_free_list/src/lib.rs index f99b30f..f99b30f 100644 --- a/crates/physmem_free_list/src/lib.rs +++ b/crates/alloc_physmem_free_list/src/lib.rs |