From bd00921dac03000e506232fc1bb26a48358bd918 Mon Sep 17 00:00:00 2001 From: Philipp Oppermann Date: Mon, 7 Dec 2015 15:23:18 +0100 Subject: [PATCH] Use expect instead of unwrap --- posts/DRAFT-paging.md | 2 +- src/memory/paging/mod.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/posts/DRAFT-paging.md b/posts/DRAFT-paging.md index d8792326..3c11ed1c 100644 --- a/posts/DRAFT-paging.md +++ b/posts/DRAFT-paging.md @@ -672,7 +672,7 @@ fn unmap(&mut self, page: Page, allocator: &mut A) .next_table_mut(page.p4_index()) .and_then(|p3| p3.next_table_mut(page.p3_index())) .and_then(|p2| p2.next_table_mut(page.p2_index())) - .unwrap(); + .expect("mapping code does not support huge pages"); let frame = p1[page.p1_index()].pointed_frame().unwrap(); p1[page.p1_index()].set_unused(); unsafe { tlb::flush(page.start_address()) }; diff --git a/src/memory/paging/mod.rs b/src/memory/paging/mod.rs index dfe817d3..9f6c12fb 100644 --- a/src/memory/paging/mod.rs +++ b/src/memory/paging/mod.rs @@ -166,7 +166,7 @@ impl RecursivePageTable { .next_table_mut(page.p4_index()) .and_then(|p3| p3.next_table_mut(page.p3_index())) .and_then(|p2| p2.next_table_mut(page.p2_index())) - .unwrap(); + .expect("mapping code does not support huge pages"); let frame = p1[page.p1_index()].pointed_frame().unwrap(); p1[page.p1_index()].set_unused(); unsafe { tlb::flush(page.start_address()) };