From 0dd19888fdc38516525fe314a7a8d88f809f8319 Mon Sep 17 00:00:00 2001
From: Christian Cunningham <cc@localhost>
Date: Wed, 24 Aug 2022 19:28:17 -0700
Subject: Rename

---
 src/kernel.rs    | 4 ++--
 src/mem/alloc.rs | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/kernel.rs b/src/kernel.rs
index a6d8402..e92c701 100644
--- a/src/kernel.rs
+++ b/src/kernel.rs
@@ -32,7 +32,7 @@ mod sync;
 mod uart;
 mod util;
 use crate::console::console;
-use crate::mem::alloc::alloc;
+use crate::mem::alloc::allocator;
 
 /// # Initialization Code
 ///
@@ -51,7 +51,7 @@ use crate::mem::alloc::alloc;
 /// the regular main.
 unsafe fn kernel_init() -> ! {
 	console().init().unwrap();
-	alloc().init().unwrap();
+	allocator().init().unwrap();
 	kernel_main()
 }
 
diff --git a/src/mem/alloc.rs b/src/mem/alloc.rs
index 307be5c..a98e680 100644
--- a/src/mem/alloc.rs
+++ b/src/mem/alloc.rs
@@ -303,7 +303,7 @@ pub static ALLOCATOR: GrandAllocator = GrandAllocator{};
 /// # Global Allocator
 ///
 /// Returns a borrow for the Global Allocator
-pub fn alloc() -> &'static crate::mem::alloc::GrandAllocator {
+pub fn allocator() -> &'static crate::mem::alloc::GrandAllocator {
 	vprintln!("AL: Getting global allocator!");
 	&crate::mem::alloc::ALLOCATOR
 }
-- 
cgit v1.2.1