From aa1408b1911e8bea64e4208b95ffc5014d4349b2 Mon Sep 17 00:00:00 2001
From: Erin Moon <erin@hashbang.sh>
Date: Mon, 22 Oct 2018 12:07:16 -0500
Subject: [PATCH] paging::mapper: switch from Unique<T> to NonNull<T>

---
 src/arch/x86_64/memory/paging/mapper.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/arch/x86_64/memory/paging/mapper.rs b/src/arch/x86_64/memory/paging/mapper.rs
index a01ff17..044fe2e 100644
--- a/src/arch/x86_64/memory/paging/mapper.rs
+++ b/src/arch/x86_64/memory/paging/mapper.rs
@@ -2,11 +2,11 @@
 use super::table::{self, EntryFlags, Level4, Table, ENTRY_COUNT};
 use super::{Frame, Page, PhysicalAddress, VirtualAddress};
 use arch::x86_64::memory::FrameAllocator;
-use core::ptr::Unique;
+use core::ptr::NonNull;
 
 /// Owns the top-level active page table (P4).
 pub struct Mapper {
-    p4: Unique<Table<Level4>>,
+    p4: NonNull<Table<Level4>>,
 }
 
 impl Mapper {
@@ -14,7 +14,7 @@ impl Mapper {
     /// Since we cannot guarantee this trivially, the constructor is unsafe.
     pub unsafe fn new() -> Mapper {
         Mapper {
-            p4: Unique::new_unchecked(table::P4),
+            p4: NonNull::new_unchecked(table::P4),
         }
     }