From 501ce6c4be996d620e4caf4ac3330f51a517ea54 Mon Sep 17 00:00:00 2001 From: WangRunji Date: Fri, 21 Sep 2018 16:00:48 +0800 Subject: [PATCH] Fix memory crate test compile. --- crate/memory/src/paging/mock_page_table.rs | 2 +- crate/memory/src/swap/mock_swapper.rs | 2 +- crate/memory/src/swap/mod.rs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/crate/memory/src/paging/mock_page_table.rs b/crate/memory/src/paging/mock_page_table.rs index fcba287..d26b7af 100644 --- a/crate/memory/src/paging/mock_page_table.rs +++ b/crate/memory/src/paging/mock_page_table.rs @@ -133,7 +133,7 @@ impl MockPageTable { #[cfg(test)] mod test { use super::*; - use alloc::arc::Arc; + use alloc::sync::Arc; use core::cell::RefCell; #[test] diff --git a/crate/memory/src/swap/mock_swapper.rs b/crate/memory/src/swap/mock_swapper.rs index c6b323c..1db7708 100644 --- a/crate/memory/src/swap/mock_swapper.rs +++ b/crate/memory/src/swap/mock_swapper.rs @@ -1,5 +1,5 @@ use super::Swapper; -use alloc::btree_map::BTreeMap; +use alloc::collections::BTreeMap; use core::mem::uninitialized; const PAGE_SIZE: usize = 4096; diff --git a/crate/memory/src/swap/mod.rs b/crate/memory/src/swap/mod.rs index 5dcc7ae..6456e19 100644 --- a/crate/memory/src/swap/mod.rs +++ b/crate/memory/src/swap/mod.rs @@ -135,7 +135,7 @@ impl DerefMut for SwapExt { mod test { use super::*; use super::mock_swapper::MockSwapper; - use alloc::{arc::Arc, boxed::Box}; + use alloc::{sync::Arc, boxed::Box}; use core::cell::RefCell; use paging::MockPageTable;