michaelkuc6/blog_os
1
0
Fork 0
mirror of https://github.com/phil-opp/blog_os.git synced 2025-12-16 22:37:49 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'post-11' into post-12

Browse Source
This commit is contained in:
Philipp Oppermann
2021-02-02 11:46:44 +01:00
parent 9925d2e46e d57a9d3f1f
commit 55a787f413
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/allocator/fixed_size_block.rs
View File

@@ -31,8 +31,9 @@ pub struct FixedSizeBlockAllocator {
impl FixedSizeBlockAllocator { impl FixedSizeBlockAllocator {
/// Creates an empty FixedSizeBlockAllocator. /// Creates an empty FixedSizeBlockAllocator.
pub const fn new() -> Self { pub const fn new() -> Self {
const EMPTY: Option<&'static mut ListNode> = None;
FixedSizeBlockAllocator { FixedSizeBlockAllocator {
list_heads: [None; BLOCK_SIZES.len()], list_heads: [EMPTY; BLOCK_SIZES.len()],
fallback_allocator: linked_list_allocator::Heap::empty(), fallback_allocator: linked_list_allocator::Heap::empty(),
} }
} }

1
src/lib.rs
View File

@@ -4,7 +4,6 @@
#![feature(abi_x86_interrupt)] #![feature(abi_x86_interrupt)]
#![feature(alloc_error_handler)] #![feature(alloc_error_handler)]
#![feature(const_mut_refs)] #![feature(const_mut_refs)]
#![feature(const_in_array_repeat_expressions)]
#![feature(wake_trait)] #![feature(wake_trait)]
#![test_runner(crate::test_runner)] #![test_runner(crate::test_runner)]
#![reexport_test_harness_main = "test_main"] #![reexport_test_harness_main = "test_main"]