Migrate from collections

src/context/context.rs

@@ -1,6 +1,6 @@
 use alloc::arc::Arc;
 use alloc::boxed::Box;
-use collections::{BTreeMap, Vec, VecDeque};
+use alloc::{BTreeMap, Vec, VecDeque};
 use core::mem;
 use spin::Mutex;
 

src/context/event.rs

@@ -1,5 +1,5 @@
 use alloc::arc::{Arc, Weak};
-use collections::BTreeMap;
+use alloc::BTreeMap;
 use spin::{Once, RwLock, RwLockReadGuard, RwLockWriteGuard};
 
 use context;

src/context/list.rs

@@ -2,7 +2,7 @@ use alloc::allocator::{Alloc, Layout};
 use alloc::arc::Arc;
 use alloc::boxed::Box;
 use alloc::heap::Heap;
-use collections::BTreeMap;
+use alloc::BTreeMap;
 use core::mem;
 use core::sync::atomic::Ordering;
 use paging;
@@ -36,7 +36,7 @@ impl ContextList {
         self.map.get(&super::CONTEXT_ID.load(Ordering::SeqCst))
     }
 
-    pub fn iter(&self) -> ::collections::btree_map::Iter<ContextId, Arc<RwLock<Context>>> {
+    pub fn iter(&self) -> ::alloc::btree_map::Iter<ContextId, Arc<RwLock<Context>>> {
         self.map.iter()
     }
 

src/context/memory.rs

@@ -1,5 +1,5 @@
 use alloc::arc::{Arc, Weak};
-use collections::VecDeque;
+use alloc::VecDeque;
 use core::intrinsics;
 use spin::Mutex;
 

src/context/timeout.rs

@@ -1,4 +1,4 @@
-use collections::vec_deque::VecDeque;
+use alloc::vec_deque::VecDeque;
 use core::mem;
 use spin::{Once, Mutex, MutexGuard};