From e6b9f850d10f22090e4ade6ed1faab958bdffd0f Mon Sep 17 00:00:00 2001 From: Tibor Nagy Date: Sat, 28 Oct 2017 02:42:08 +0200 Subject: [PATCH] Migrate from collections --- Xargo.toml | 2 -- build.rs | 2 +- src/acpi/aml/dataobj.rs | 4 ++-- src/acpi/aml/mod.rs | 4 ++-- src/acpi/aml/namedobj.rs | 4 ++-- src/acpi/aml/namespace.rs | 8 ++++---- src/acpi/aml/namestring.rs | 4 ++-- src/acpi/aml/parser.rs | 6 +++--- src/acpi/aml/termlist.rs | 2 +- src/acpi/aml/type2opcode.rs | 4 ++-- src/acpi/mod.rs | 6 +++--- src/context/context.rs | 2 +- src/context/event.rs | 2 +- src/context/list.rs | 4 ++-- src/context/memory.rs | 2 +- src/context/timeout.rs | 2 +- src/elf.rs | 2 +- src/lib.rs | 3 +-- src/memory/recycle.rs | 2 +- src/scheme/env.rs | 2 +- src/scheme/event.rs | 2 +- src/scheme/initfs.rs | 4 ++-- src/scheme/live.rs | 2 +- src/scheme/mod.rs | 6 +++--- src/scheme/pipe.rs | 2 +- src/scheme/root.rs | 2 +- src/scheme/sys/context.rs | 2 +- src/scheme/sys/cpu.rs | 2 +- src/scheme/sys/exe.rs | 2 +- src/scheme/sys/iostat.rs | 2 +- src/scheme/sys/mod.rs | 2 +- src/scheme/sys/scheme.rs | 2 +- src/scheme/sys/scheme_num.rs | 2 +- src/scheme/sys/syscall.rs | 2 +- src/scheme/sys/uname.rs | 2 +- src/scheme/time.rs | 2 +- src/scheme/user.rs | 2 +- src/sync/wait_condition.rs | 2 +- src/sync/wait_map.rs | 2 +- src/sync/wait_queue.rs | 2 +- src/syscall/debug.rs | 2 +- src/syscall/futex.rs | 2 +- src/syscall/privilege.rs | 2 +- src/syscall/process.rs | 2 +- 44 files changed, 59 insertions(+), 62 deletions(-) diff --git a/Xargo.toml b/Xargo.toml index bc268c0..ea3144e 100644 --- a/Xargo.toml +++ b/Xargo.toml @@ -1,3 +1 @@ [dependencies.alloc] - -[dependencies.collections] diff --git a/build.rs b/build.rs index 5ee3058..4efa33e 100644 --- a/build.rs +++ b/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(); diff --git a/src/acpi/aml/dataobj.rs b/src/acpi/aml/dataobj.rs index a96f021..10ffaf1 100644 --- a/src/acpi/aml/dataobj.rs +++ b/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 }; diff --git a/src/acpi/aml/mod.rs b/src/acpi/aml/mod.rs index 250f29f..332e5fb 100644 --- a/src/acpi/aml/mod.rs +++ b/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; diff --git a/src/acpi/aml/namedobj.rs b/src/acpi/aml/namedobj.rs index c2897fd..49ae26c 100644 --- a/src/acpi/aml/namedobj.rs +++ b/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 }; diff --git a/src/acpi/aml/namespace.rs b/src/acpi/aml/namespace.rs index 0ebc855..906d3f6 100644 --- a/src/acpi/aml/namespace.rs +++ b/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; diff --git a/src/acpi/aml/namestring.rs b/src/acpi/aml/namestring.rs index 81fee85..a8156f4 100644 --- a/src/acpi/aml/namestring.rs +++ b/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}; diff --git a/src/acpi/aml/parser.rs b/src/acpi/aml/parser.rs index 0f26321..12ab3ae 100644 --- a/src/acpi/aml/parser.rs +++ b/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; diff --git a/src/acpi/aml/termlist.rs b/src/acpi/aml/termlist.rs index 75967a0..b67430e 100644 --- a/src/acpi/aml/termlist.rs +++ b/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 }; diff --git a/src/acpi/aml/type2opcode.rs b/src/acpi/aml/type2opcode.rs index 19e359c..50d9324 100644 --- a/src/acpi/aml/type2opcode.rs +++ b/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}; diff --git a/src/acpi/mod.rs b/src/acpi/mod.rs index c5dd0d5..8939938 100644 --- a/src/acpi/mod.rs +++ b/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}; diff --git a/src/context/context.rs b/src/context/context.rs index 6702be3..b6b8d0e 100644 --- a/src/context/context.rs +++ b/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; diff --git a/src/context/event.rs b/src/context/event.rs index c6c9431..fd582f2 100644 --- a/src/context/event.rs +++ b/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; diff --git a/src/context/list.rs b/src/context/list.rs index aad872e..71e688d 100644 --- a/src/context/list.rs +++ b/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>> { + pub fn iter(&self) -> ::alloc::btree_map::Iter>> { self.map.iter() } diff --git a/src/context/memory.rs b/src/context/memory.rs index ebf60d5..f9fe8c0 100644 --- a/src/context/memory.rs +++ b/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; diff --git a/src/context/timeout.rs b/src/context/timeout.rs index 9d9942a..3e5c886 100644 --- a/src/context/timeout.rs +++ b/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}; diff --git a/src/elf.rs b/src/elf.rs index ac5cb77..a44a955 100644 --- a/src/elf.rs +++ b/src/elf.rs @@ -1,6 +1,6 @@ //! ELF executables -use collections::String; +use alloc::String; use goblin::elf::section_header::SHT_SYMTAB; diff --git a/src/lib.rs b/src/lib.rs index c30602b..6a509ef 100644 --- a/src/lib.rs +++ b/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; diff --git a/src/memory/recycle.rs b/src/memory/recycle.rs index aa62350..5b7c159 100644 --- a/src/memory/recycle.rs +++ b/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; diff --git a/src/scheme/env.rs b/src/scheme/env.rs index b846c44..3c359dd 100644 --- a/src/scheme/env.rs +++ b/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}; diff --git a/src/scheme/event.rs b/src/scheme/event.rs index 210b5dd..80915e2 100644 --- a/src/scheme/event.rs +++ b/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; diff --git a/src/scheme/initfs.rs b/src/scheme/initfs.rs index cfae5de..a283f38 100644 --- a/src/scheme/initfs.rs +++ b/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() } } diff --git a/src/scheme/live.rs b/src/scheme/live.rs index 4ea1eef..95afdad 100644 --- a/src/scheme/live.rs +++ b/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; diff --git a/src/scheme/mod.rs b/src/scheme/mod.rs index 74f0e49..6ca1f20 100644 --- a/src/scheme/mod.rs +++ b/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>> { + pub fn iter(&self) -> ::alloc::btree_map::Iter>> { self.map.iter() } - pub fn iter_name(&self, ns: SchemeNamespace) -> ::collections::btree_map::Iter, SchemeId> { + pub fn iter_name(&self, ns: SchemeNamespace) -> ::alloc::btree_map::Iter, SchemeId> { self.names[&ns].iter() } diff --git a/src/scheme/pipe.rs b/src/scheme/pipe.rs index d39de34..cf67760 100644 --- a/src/scheme/pipe.rs +++ b/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}; diff --git a/src/scheme/root.rs b/src/scheme/root.rs index 071b1f3..f98af13 100644 --- a/src/scheme/root.rs +++ b/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}; diff --git a/src/scheme/sys/context.rs b/src/scheme/sys/context.rs index 5712977..9e87752 100644 --- a/src/scheme/sys/context.rs +++ b/src/scheme/sys/context.rs @@ -1,4 +1,4 @@ -use collections::{String, Vec}; +use alloc::{String, Vec}; use core::str; use context; diff --git a/src/scheme/sys/cpu.rs b/src/scheme/sys/cpu.rs index d61205a..7201408 100644 --- a/src/scheme/sys/cpu.rs +++ b/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}; diff --git a/src/scheme/sys/exe.rs b/src/scheme/sys/exe.rs index 84eb266..0fa7a82 100644 --- a/src/scheme/sys/exe.rs +++ b/src/scheme/sys/exe.rs @@ -1,4 +1,4 @@ -use collections::Vec; +use alloc::Vec; use context; use syscall::error::{Error, ESRCH, Result}; diff --git a/src/scheme/sys/iostat.rs b/src/scheme/sys/iostat.rs index b0b49ad..92bf3b1 100644 --- a/src/scheme/sys/iostat.rs +++ b/src/scheme/sys/iostat.rs @@ -1,4 +1,4 @@ -use collections::{String, Vec}; +use alloc::{String, Vec}; use core::fmt::Write; use core::str; diff --git a/src/scheme/sys/mod.rs b/src/scheme/sys/mod.rs index e85202d..91380f1 100644 --- a/src/scheme/sys/mod.rs +++ b/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; diff --git a/src/scheme/sys/scheme.rs b/src/scheme/sys/scheme.rs index 92f6883..226327e 100644 --- a/src/scheme/sys/scheme.rs +++ b/src/scheme/sys/scheme.rs @@ -1,4 +1,4 @@ -use collections::Vec; +use alloc::Vec; use context; use scheme; diff --git a/src/scheme/sys/scheme_num.rs b/src/scheme/sys/scheme_num.rs index e3ae184..f2a3a21 100644 --- a/src/scheme/sys/scheme_num.rs +++ b/src/scheme/sys/scheme_num.rs @@ -1,4 +1,4 @@ -use collections::Vec; +use alloc::Vec; use context; use scheme; diff --git a/src/scheme/sys/syscall.rs b/src/scheme/sys/syscall.rs index 1556e39..06cb973 100644 --- a/src/scheme/sys/syscall.rs +++ b/src/scheme/sys/syscall.rs @@ -1,4 +1,4 @@ -use collections::{String, Vec}; +use alloc::{String, Vec}; use core::fmt::Write; use core::str; diff --git a/src/scheme/sys/uname.rs b/src/scheme/sys/uname.rs index 29daef8..7160671 100644 --- a/src/scheme/sys/uname.rs +++ b/src/scheme/sys/uname.rs @@ -1,4 +1,4 @@ -use collections::Vec; +use alloc::Vec; use syscall::error::Result; pub fn resource() -> Result> { diff --git a/src/scheme/time.rs b/src/scheme/time.rs index 7953cd9..2e9c09a 100644 --- a/src/scheme/time.rs +++ b/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; diff --git a/src/scheme/user.rs b/src/scheme/user.rs index 1a389af..ed2b06c 100644 --- a/src/scheme/user.rs +++ b/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}; diff --git a/src/sync/wait_condition.rs b/src/sync/wait_condition.rs index 46db303..8c9a6a7 100644 --- a/src/sync/wait_condition.rs +++ b/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}; diff --git a/src/sync/wait_map.rs b/src/sync/wait_map.rs index 1812077..2705969 100644 --- a/src/sync/wait_map.rs +++ b/src/sync/wait_map.rs @@ -1,4 +1,4 @@ -use collections::BTreeMap; +use alloc::BTreeMap; use core::mem; use spin::Mutex; diff --git a/src/sync/wait_queue.rs b/src/sync/wait_queue.rs index d36bc30..a3c5ded 100644 --- a/src/sync/wait_queue.rs +++ b/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; diff --git a/src/syscall/debug.rs b/src/syscall/debug.rs index 6787ae2..dfe0cda 100644 --- a/src/syscall/debug.rs +++ b/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; diff --git a/src/syscall/futex.rs b/src/syscall/futex.rs index 4b9c30c..7a2500b 100644 --- a/src/syscall/futex.rs +++ b/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}; diff --git a/src/syscall/privilege.rs b/src/syscall/privilege.rs index c5d6f6e..5a47cc3 100644 --- a/src/syscall/privilege.rs +++ b/src/syscall/privilege.rs @@ -1,4 +1,4 @@ -use collections::Vec; +use alloc::Vec; use context; use scheme::{self, SchemeNamespace}; diff --git a/src/syscall/process.rs b/src/syscall/process.rs index 2add5cd..98e3034 100644 --- a/src/syscall/process.rs +++ b/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;