Migrate from collections

src/scheme/env.rs

@@ -1,5 +1,5 @@
 use alloc::arc::Arc;
-use collections::{BTreeMap, Vec};
+use alloc::{BTreeMap, Vec};
 use core::{cmp, str};
 use core::sync::atomic::{AtomicUsize, Ordering};
 use spin::{Mutex, RwLock};

src/scheme/event.rs

@@ -1,5 +1,5 @@
 use alloc::arc::{Arc, Weak};
-use collections::BTreeMap;
+use alloc::BTreeMap;
 use core::{mem, slice};
 use core::sync::atomic::{AtomicUsize, Ordering};
 use spin::RwLock;

src/scheme/initfs.rs

@@ -1,4 +1,4 @@
-use collections::BTreeMap;
+use alloc::BTreeMap;
 use core::{cmp, str};
 use core::sync::atomic::{AtomicUsize, Ordering};
 use spin::RwLock;
@@ -10,7 +10,7 @@ use syscall::scheme::Scheme;
 
 #[cfg(test)]
 mod gen {
-    use collections::BTreeMap;
+    use alloc::BTreeMap;
     pub fn gen() -> BTreeMap<&'static [u8], (&'static [u8], bool)> { BTreeMap::new() }
 }
 

src/scheme/live.rs

@@ -1,7 +1,7 @@
 /// Disk scheme replacement when making live disk
 
 use alloc::arc::Arc;
-use collections::BTreeMap;
+use alloc::BTreeMap;
 use core::{cmp, slice};
 use core::sync::atomic::{AtomicUsize, Ordering};
 use spin::RwLock;

src/scheme/mod.rs

@@ -8,7 +8,7 @@
 
 use alloc::arc::Arc;
 use alloc::boxed::Box;
-use collections::BTreeMap;
+use alloc::BTreeMap;
 use core::sync::atomic::AtomicUsize;
 use spin::{Once, RwLock, RwLockReadGuard, RwLockWriteGuard};
 
@@ -174,11 +174,11 @@ impl SchemeList {
         Ok(to)
     }
 
-    pub fn iter(&self) -> ::collections::btree_map::Iter<SchemeId, Arc<Box<Scheme + Send + Sync>>> {
+    pub fn iter(&self) -> ::alloc::btree_map::Iter<SchemeId, Arc<Box<Scheme + Send + Sync>>> {
         self.map.iter()
     }
 
-    pub fn iter_name(&self, ns: SchemeNamespace) -> ::collections::btree_map::Iter<Box<[u8]>, SchemeId> {
+    pub fn iter_name(&self, ns: SchemeNamespace) -> ::alloc::btree_map::Iter<Box<[u8]>, SchemeId> {
         self.names[&ns].iter()
     }
 

src/scheme/pipe.rs

@@ -1,5 +1,5 @@
 use alloc::arc::{Arc, Weak};
-use collections::{BTreeMap, VecDeque};
+use alloc::{BTreeMap, VecDeque};
 use core::sync::atomic::{AtomicUsize, ATOMIC_USIZE_INIT, Ordering};
 use spin::{Mutex, Once, RwLock, RwLockReadGuard, RwLockWriteGuard};
 

src/scheme/root.rs

@@ -1,6 +1,6 @@
 use alloc::arc::Arc;
 use alloc::boxed::Box;
-use collections::{BTreeMap, Vec};
+use alloc::{BTreeMap, Vec};
 use core::str;
 use core::sync::atomic::{AtomicUsize, Ordering};
 use spin::{Mutex, RwLock};

src/scheme/sys/context.rs

@@ -1,4 +1,4 @@
-use collections::{String, Vec};
+use alloc::{String, Vec};
 use core::str;
 
 use context;

src/scheme/sys/cpu.rs

@@ -1,4 +1,4 @@
-use collections::Vec;
+use alloc::Vec;
 
 use device::cpu::cpu_info;
 use syscall::error::{Error, EIO, Result};

src/scheme/sys/exe.rs

@@ -1,4 +1,4 @@
-use collections::Vec;
+use alloc::Vec;
 
 use context;
 use syscall::error::{Error, ESRCH, Result};

src/scheme/sys/iostat.rs

@@ -1,4 +1,4 @@
-use collections::{String, Vec};
+use alloc::{String, Vec};
 use core::fmt::Write;
 use core::str;
 

src/scheme/sys/mod.rs

@@ -1,5 +1,5 @@
 use alloc::boxed::Box;
-use collections::{BTreeMap, Vec};
+use alloc::{BTreeMap, Vec};
 use core::{cmp, str};
 use core::sync::atomic::{AtomicUsize, Ordering};
 use spin::RwLock;

src/scheme/sys/scheme.rs

@@ -1,4 +1,4 @@
-use collections::Vec;
+use alloc::Vec;
 
 use context;
 use scheme;

src/scheme/sys/scheme_num.rs

@@ -1,4 +1,4 @@
-use collections::Vec;
+use alloc::Vec;
 
 use context;
 use scheme;

src/scheme/sys/syscall.rs

@@ -1,4 +1,4 @@
-use collections::{String, Vec};
+use alloc::{String, Vec};
 use core::fmt::Write;
 use core::str;
 

src/scheme/sys/uname.rs

@@ -1,4 +1,4 @@
-use collections::Vec;
+use alloc::Vec;
 use syscall::error::Result;
 
 pub fn resource() -> Result<Vec<u8>> {

src/scheme/time.rs

@@ -1,4 +1,4 @@
-use collections::BTreeMap;
+use alloc::BTreeMap;
 use core::{mem, slice, str};
 use core::sync::atomic::{AtomicUsize, Ordering};
 use spin::RwLock;

src/scheme/user.rs

@@ -1,6 +1,6 @@
 use alloc::arc::{Arc, Weak};
 use alloc::boxed::Box;
-use collections::BTreeMap;
+use alloc::BTreeMap;
 use core::sync::atomic::{AtomicU64, Ordering};
 use core::{mem, slice, usize};
 use spin::{Mutex, RwLock};