Migrate from collections

Xargo.toml

@@ -1,3 +1 @@
 [dependencies.alloc]
-
-[dependencies.collections]

build.rs

@@ -97,7 +97,7 @@ fn main() {
     // Write header
     f.write_all(b"
 mod gen {
-    use collections::BTreeMap;
+    use alloc::BTreeMap;
     pub fn gen() -> BTreeMap<&'static [u8], (&'static [u8], bool)> {
         let mut files: BTreeMap<&'static [u8], (&'static [u8], bool)> = BTreeMap::new();
 ").unwrap();

src/acpi/aml/dataobj.rs

@@ -1,5 +1,5 @@
-use collections::vec::Vec;
-use collections::string::String;
+use alloc::vec::Vec;
+use alloc::string::String;
 
 use super::AmlError;
 use super::parser::{ AmlParseType, ParseResult, AmlExecutionContext, ExecutionState };

src/acpi/aml/mod.rs

@@ -1,8 +1,8 @@
 //! # AML
 //! Code to parse and execute AML tables
 
-use collections::string::String;
-use collections::vec::Vec;
+use alloc::string::String;
+use alloc::vec::Vec;
 use core::str::FromStr;
 
 use super::sdt::Sdt;

src/acpi/aml/namedobj.rs

@@ -1,6 +1,6 @@
 use alloc::boxed::Box;
-use collections::string::String;
-use collections::btree_map::BTreeMap;
+use alloc::string::String;
+use alloc::btree_map::BTreeMap;
 
 use super::AmlError;
 use super::parser::{ AmlParseType, ParseResult, AmlParseTypeGeneric, AmlExecutionContext, ExecutionState };

src/acpi/aml/namespace.rs

@@ -1,8 +1,8 @@
 use alloc::boxed::Box;
-use collections::string::String;
-use collections::string::ToString;
-use collections::vec::Vec;
-use collections::btree_map::BTreeMap;
+use alloc::string::String;
+use alloc::string::ToString;
+use alloc::vec::Vec;
+use alloc::btree_map::BTreeMap;
 
 use core::fmt::{Debug, Formatter, Error};
 use core::str::FromStr;

src/acpi/aml/namestring.rs

@@ -1,5 +1,5 @@
-use collections::vec::Vec;
-use collections::string::String;
+use alloc::vec::Vec;
+use alloc::string::String;
 
 use super::AmlError;
 use super::parser::{AmlParseType, ParseResult, AmlExecutionContext, ExecutionState};

src/acpi/aml/parser.rs

@@ -1,6 +1,6 @@
-use collections::string::String;
-use collections::btree_map::BTreeMap;
-use collections::vec::Vec;
+use alloc::string::String;
+use alloc::btree_map::BTreeMap;
+use alloc::vec::Vec;
 use alloc::boxed::Box;
 
 use spin::RwLockWriteGuard;

src/acpi/aml/termlist.rs

@@ -1,4 +1,4 @@
-use collections::vec::Vec;
+use alloc::vec::Vec;
 
 use super::AmlError;
 use super::parser::{ AmlParseType, ParseResult, AmlExecutionContext, ExecutionState };

src/acpi/aml/type2opcode.rs

@@ -1,6 +1,6 @@
 use alloc::boxed::Box;
-use collections::string::String;
-use collections::vec::Vec;
+use alloc::string::String;
+use alloc::vec::Vec;
 
 use super::{AmlError, parse_aml_with_scope};
 use super::parser::{AmlParseType, ParseResult, AmlExecutionContext, ExecutionState};

src/acpi/mod.rs

@@ -1,9 +1,9 @@
 //! # ACPI
 //! Code to parse the ACPI tables
 
-use collections::btree_map::BTreeMap;
-use collections::string::String;
-use collections::vec::Vec;
+use alloc::btree_map::BTreeMap;
+use alloc::string::String;
+use alloc::vec::Vec;
 use alloc::boxed::Box;
 
 use syscall::io::{Io, Pio};

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};
 

src/elf.rs

@@ -1,6 +1,6 @@
 //! ELF executables
 
-use collections::String;
+use alloc::String;
 
 use goblin::elf::section_header::SHT_SYMTAB;
 

src/lib.rs

@@ -27,9 +27,8 @@
 extern crate alloc_kernel as allocator;
 pub extern crate x86;
 
-extern crate alloc;
 #[macro_use]
-extern crate collections;
+extern crate alloc;
 
 #[macro_use]
 extern crate bitflags;

src/memory/recycle.rs

@@ -1,7 +1,7 @@
 //! Recycle allocator
 //! Uses freed frames if possible, then uses inner allocator
 
-use collections::Vec;
+use alloc::Vec;
 
 use paging::PhysicalAddress;
 

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};

src/sync/wait_condition.rs

@@ -1,5 +1,5 @@
 use alloc::arc::Arc;
-use collections::Vec;
+use alloc::Vec;
 use spin::{Mutex, RwLock};
 
 use context::{self, Context, SwitchResult};

src/sync/wait_map.rs

@@ -1,4 +1,4 @@
-use collections::BTreeMap;
+use alloc::BTreeMap;
 use core::mem;
 use spin::Mutex;
 

src/sync/wait_queue.rs

@@ -1,4 +1,4 @@
-use collections::vec_deque::VecDeque;
+use alloc::vec_deque::VecDeque;
 use spin::Mutex;
 
 use sync::WaitCondition;

src/syscall/debug.rs

@@ -1,6 +1,6 @@
 use core::mem;
 use core::ops::Range;
-use collections::{String, Vec};
+use alloc::{String, Vec};
 
 use super::data::{Stat, TimeSpec};
 use super::error::Result;

src/syscall/futex.rs

@@ -1,5 +1,5 @@
 use alloc::arc::Arc;
-use collections::VecDeque;
+use alloc::VecDeque;
 use core::intrinsics;
 use spin::{Once, RwLock, RwLockReadGuard, RwLockWriteGuard};
 

src/syscall/privilege.rs

@@ -1,4 +1,4 @@
-use collections::Vec;
+use alloc::Vec;
 
 use context;
 use scheme::{self, SchemeNamespace};

src/syscall/process.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, Vec};
+use alloc::{BTreeMap, Vec};
 use core::{intrinsics, mem, str};
 use core::ops::DerefMut;
 use spin::Mutex;