Change import styling

Author: veluca93

pixie-uefi/src/export_cov.rs

@@ -1,4 +1,5 @@
-use crate::os::{disk::Disk, UefiOS};
+use crate::os::disk::Disk;
+use crate::os::UefiOS;
 
 pub async fn export(os: UefiOS) {
     let mut disk = Disk::open_with_size(os, 500 << 20);

pixie-uefi/src/flash.rs

@@ -1,21 +1,23 @@
-use crate::{
-    os::{
-        error::{Error, Result},
-        memory, TcpStream, UefiOS, PACKET_SIZE,
-    },
-    MIN_MEMORY,
-};
-use alloc::{boxed::Box, collections::BTreeMap, rc::Rc, vec::Vec};
-use core::{cell::RefCell, mem, net::SocketAddrV4};
+use alloc::boxed::Box;
+use alloc::collections::BTreeMap;
+use alloc::rc::Rc;
+use alloc::vec::Vec;
+use core::cell::RefCell;
+use core::mem;
+use core::net::SocketAddrV4;
+
 use futures::future::{select, Either};
 use log::info;
 use lz4_flex::decompress;
-use pixie_shared::{
-    chunk_codec::Decoder, util::BytesFmt, ChunkHash, Image, TcpRequest, UdpRequest, CHUNKS_PORT,
-    MAX_CHUNK_SIZE,
-};
+use pixie_shared::chunk_codec::Decoder;
+use pixie_shared::util::BytesFmt;
+use pixie_shared::{ChunkHash, Image, TcpRequest, UdpRequest, CHUNKS_PORT, MAX_CHUNK_SIZE};
 use uefi::proto::console::text::Color;
 
+use crate::os::error::{Error, Result};
+use crate::os::{memory, TcpStream, UefiOS, PACKET_SIZE};
+use crate::MIN_MEMORY;
+
 async fn fetch_image(stream: &TcpStream) -> Result<Image> {
     let req = TcpRequest::GetImage;
     let mut buf = postcard::to_allocvec(&req)?;

pixie-uefi/src/main.rs

@@ -5,22 +5,20 @@
 #[macro_use]
 extern crate alloc;
 
-use crate::{
-    flash::flash,
-    os::{
-        error::{Error, Result},
-        TcpStream, UefiOS, PACKET_SIZE,
-    },
-    reboot_to_os::reboot_to_os,
-    register::register,
-    store::store,
-};
 use alloc::boxed::Box;
 use core::net::{Ipv4Addr, SocketAddrV4};
+
 use futures::future::{self, Either};
 use pixie_shared::{Action, TcpRequest, UdpRequest, ACTION_PORT, PING_PORT};
 use uefi::{entry, Status};
 
+use crate::flash::flash;
+use crate::os::error::{Error, Result};
+use crate::os::{TcpStream, UefiOS, PACKET_SIZE};
+use crate::reboot_to_os::reboot_to_os;
+use crate::register::register;
+use crate::store::store;
+
 mod flash;
 mod os;
 mod parse_disk;

pixie-uefi/src/os/boot_options.rs

@@ -1,13 +1,11 @@
+use alloc::string::{String, ToString};
+use alloc::vec::Vec;
+
+use uefi::proto::device_path::DevicePath;
+use uefi::runtime::{VariableAttributes, VariableVendor};
+use uefi::CString16;
+
 use super::UefiOS;
-use alloc::{
-    string::{String, ToString},
-    vec::Vec,
-};
-use uefi::{
-    proto::device_path::DevicePath,
-    runtime::{VariableAttributes, VariableVendor},
-    CString16,
-};
 
 pub struct BootOptions {
     pub(super) os: UefiOS,

pixie-uefi/src/os/disk.rs

@@ -1,17 +1,14 @@
-use super::{error::Result, UefiOS};
-use alloc::{
-    string::{String, ToString},
-    vec::Vec,
-};
-use gpt_disk_io::{
-    gpt_disk_types::{BlockSize, Lba},
-    BlockIo,
-};
-use uefi::{
-    boot::{OpenProtocolParams, ScopedProtocol},
-    proto::media::block::BlockIO,
-    Handle,
-};
+use alloc::string::{String, ToString};
+use alloc::vec::Vec;
+
+use gpt_disk_io::gpt_disk_types::{BlockSize, Lba};
+use gpt_disk_io::BlockIo;
+use uefi::boot::{OpenProtocolParams, ScopedProtocol};
+use uefi::proto::media::block::BlockIO;
+use uefi::Handle;
+
+use super::error::Result;
+use super::UefiOS;
 
 fn open_disk(handle: Handle) -> Result<ScopedProtocol<BlockIO>> {
     let image_handle = uefi::boot::image_handle();

pixie-uefi/src/os/error.rs

@@ -1,5 +1,7 @@
-use alloc::{borrow::ToOwned, string::String};
+use alloc::borrow::ToOwned;
+use alloc::string::String;
 use core::fmt::{Display, Formatter};
+
 use gpt_disk_io::gpt_disk_types;
 
 pub type Result<T, E = Error> = core::result::Result<T, E>;

pixie-uefi/src/os/executor.rs

@@ -1,13 +1,14 @@
-use crate::os::timer::Timer;
+use alloc::boxed::Box;
+use alloc::collections::VecDeque;
+use alloc::sync::Arc;
+use alloc::task::Wake;
+use core::cell::RefCell;
+use core::future::Future;
+use core::pin::Pin;
+use core::task::{Context, Waker};
 
 use super::sync::SyncRefCell;
-use alloc::{boxed::Box, collections::VecDeque, sync::Arc, task::Wake};
-use core::{
-    cell::RefCell,
-    future::Future,
-    pin::Pin,
-    task::{Context, Waker},
-};
+use crate::os::timer::Timer;
 
 pub(super) type BoxFuture<T = ()> = Pin<Box<dyn Future<Output = T> + 'static>>;
 

pixie-uefi/src/os/memory.rs

@@ -1,4 +1,5 @@
-use uefi::{boot::MemoryType, mem::memory_map::MemoryMap};
+use uefi::boot::MemoryType;
+use uefi::mem::memory_map::MemoryMap;
 
 #[derive(Debug)]
 pub struct MemoryStats {

pixie-uefi/src/os/mod.rs

@@ -1,46 +1,34 @@
-use self::{
-    boot_options::BootOptions,
-    disk::Disk,
-    error::{Error, Result},
-    executor::{Executor, Task},
-    net::NetworkInterface,
-    sync::SyncRefCell,
-    timer::Timer,
-};
-use alloc::{
-    boxed::Box,
-    collections::VecDeque,
-    string::{String, ToString},
-    sync::Arc,
-    vec::Vec,
-};
-use core::{
-    cell::{Ref, RefMut},
-    ffi::c_void,
-    fmt::Write,
-    future::{poll_fn, Future},
-    net::SocketAddrV4,
-    ptr::NonNull,
-    task::Poll,
-};
+use alloc::boxed::Box;
+use alloc::collections::VecDeque;
+use alloc::string::{String, ToString};
+use alloc::sync::Arc;
+use alloc::vec::Vec;
+use core::cell::{Ref, RefMut};
+use core::ffi::c_void;
+use core::fmt::Write;
+use core::future::{poll_fn, Future};
+use core::net::SocketAddrV4;
+use core::ptr::NonNull;
+use core::task::Poll;
+
 use pixie_shared::util::BytesFmt;
-use uefi::{
-    boot::{EventType, ScopedProtocol, TimerTrigger, Tpl},
-    proto::{
-        console::{
-            serial::Serial,
-            text::{Color, Input, Key, Output},
-        },
-        device_path::{
-            build::DevicePathBuilder,
-            text::{AllowShortcuts, DevicePathToText, DisplayOnly},
-            DevicePath,
-        },
-        Protocol,
-    },
-    runtime::{VariableAttributes, VariableVendor},
-    CStr16, Event, Handle, Status,
-};
+use uefi::boot::{EventType, ScopedProtocol, TimerTrigger, Tpl};
+use uefi::proto::console::serial::Serial;
+use uefi::proto::console::text::{Color, Input, Key, Output};
+use uefi::proto::device_path::build::DevicePathBuilder;
+use uefi::proto::device_path::text::{AllowShortcuts, DevicePathToText, DisplayOnly};
+use uefi::proto::device_path::DevicePath;
+use uefi::proto::Protocol;
+use uefi::runtime::{VariableAttributes, VariableVendor};
+use uefi::{CStr16, Event, Handle, Status};
+
+use self::boot_options::BootOptions;
+use self::disk::Disk;
+use self::error::{Error, Result};
+use self::executor::{Executor, Task};
+use self::net::NetworkInterface;
+use self::sync::SyncRefCell;
+use self::timer::Timer;
 
 mod boot_options;
 pub mod disk;

pixie-uefi/src/os/net.rs

@@ -1,34 +1,25 @@
-use crate::os::timer::rdtsc;
-
-use super::{
-    error::{Error, Result},
-    timer::Timer,
-    UefiOS,
-};
 use alloc::boxed::Box;
-use core::{
-    future::poll_fn,
-    net::{IpAddr, Ipv4Addr, SocketAddrV4},
-    task::Poll,
-};
+use core::future::poll_fn;
+use core::net::{IpAddr, Ipv4Addr, SocketAddrV4};
+use core::task::Poll;
+
 use futures::future::select;
-use smoltcp::{
-    iface::{Config, Interface, PollResult, SocketHandle, SocketSet},
-    phy::{Device, DeviceCapabilities, Medium, RxToken, TxToken},
-    socket::{
-        dhcpv4::{Event, Socket as Dhcpv4Socket},
-        tcp::{Socket as TcpSocket, State},
-        udp::{self, Socket as UdpSocket},
-    },
-    storage::RingBuffer,
-    time::{Duration, Instant},
-    wire::{DhcpOption, HardwareAddress, IpCidr, IpEndpoint},
-};
-use uefi::{
-    boot::ScopedProtocol,
-    proto::network::snp::{ReceiveFlags, SimpleNetwork},
-    Status,
-};
+use smoltcp::iface::{Config, Interface, PollResult, SocketHandle, SocketSet};
+use smoltcp::phy::{Device, DeviceCapabilities, Medium, RxToken, TxToken};
+use smoltcp::socket::dhcpv4::{Event, Socket as Dhcpv4Socket};
+use smoltcp::socket::tcp::{Socket as TcpSocket, State};
+use smoltcp::socket::udp::{self, Socket as UdpSocket};
+use smoltcp::storage::RingBuffer;
+use smoltcp::time::{Duration, Instant};
+use smoltcp::wire::{DhcpOption, HardwareAddress, IpCidr, IpEndpoint};
+use uefi::boot::ScopedProtocol;
+use uefi::proto::network::snp::{ReceiveFlags, SimpleNetwork};
+use uefi::Status;
+
+use super::error::{Error, Result};
+use super::timer::Timer;
+use super::UefiOS;
+use crate::os::timer::rdtsc;
 
 pub const PACKET_SIZE: usize = 1514;