diff --git a/kernel/Cargo.lock b/kernel/Cargo.lock index d2dd79e..603faef 100644 --- a/kernel/Cargo.lock +++ b/kernel/Cargo.lock @@ -125,12 +125,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "deque" version = "0.3.2" -source = "git+https://github.com/rcore-os/deque.git?branch=no_std#907d03935b9badde1902d9c84d138872f34c6763" +source = "git+https://github.com/rcore-os/deque.git?branch=no_std#b13a836dd69ae82cc0b8d711c2990b9baf5170d1" [[package]] name = "device_tree" version = "1.0.3" -source = "git+https://github.com/rcore-os/device_tree-rs#0e887395ab92e99f68117b17d85b0b417bfd1b45" +source = "git+https://github.com/rcore-os/device_tree-rs#7945459093f49a39996291283b8894753c8a638d" [[package]] name = "fixedvec" diff --git a/kernel/src/drivers/input/virtio_input.rs b/kernel/src/drivers/input/virtio_input.rs index 4f2d6a7..9ff1587 100644 --- a/kernel/src/drivers/input/virtio_input.rs +++ b/kernel/src/drivers/input/virtio_input.rs @@ -1,6 +1,8 @@ -use alloc::prelude::*; +use alloc::boxed::Box; +use alloc::string::String; use alloc::sync::Arc; use alloc::vec; +use alloc::vec::Vec; use core::fmt; use core::mem::size_of; use core::mem::transmute_copy; diff --git a/kernel/src/drivers/mod.rs b/kernel/src/drivers/mod.rs index 1363330..61e64bb 100644 --- a/kernel/src/drivers/mod.rs +++ b/kernel/src/drivers/mod.rs @@ -1,5 +1,6 @@ -use alloc::prelude::*; +use alloc::string::String; use alloc::sync::Arc; +use alloc::vec::Vec; use lazy_static::lazy_static; use smoltcp::wire::{EthernetAddress, Ipv4Address}; diff --git a/kernel/src/drivers/net/e1000.rs b/kernel/src/drivers/net/e1000.rs index 743070b..0917268 100644 --- a/kernel/src/drivers/net/e1000.rs +++ b/kernel/src/drivers/net/e1000.rs @@ -3,8 +3,9 @@ use alloc::alloc::{GlobalAlloc, Layout}; use alloc::format; -use alloc::prelude::*; +use alloc::string::String; use alloc::sync::Arc; +use alloc::vec::Vec; use core::mem::size_of; use core::slice; use core::sync::atomic::{fence, Ordering}; diff --git a/kernel/src/drivers/net/ixgbe.rs b/kernel/src/drivers/net/ixgbe.rs index fd96b7d..556739b 100644 --- a/kernel/src/drivers/net/ixgbe.rs +++ b/kernel/src/drivers/net/ixgbe.rs @@ -1,8 +1,9 @@ //! Intel 10Gb Network Adapter 82599 i.e. ixgbe network driver //! Datasheet: https://www.intel.com/content/dam/www/public/us/en/documents/datasheets/82599-10-gbe-controller-datasheet.pdf -use alloc::prelude::*; +use alloc::string::String; use alloc::sync::Arc; +use alloc::vec::Vec; use alloc::collections::BTreeMap; use isomorphic_drivers::net::ethernet::intel::ixgbe; diff --git a/kernel/src/drivers/net/virtio_net.rs b/kernel/src/drivers/net/virtio_net.rs index 397bd5d..d149ec3 100644 --- a/kernel/src/drivers/net/virtio_net.rs +++ b/kernel/src/drivers/net/virtio_net.rs @@ -1,7 +1,8 @@ use alloc::alloc::{GlobalAlloc, Layout}; use alloc::format; -use alloc::prelude::*; +use alloc::string::String; use alloc::sync::Arc; +use alloc::vec::Vec; use core::mem::size_of; use core::slice;