Cleanup include order

Make sure that we consistently use the tree import syntax.

Also, consistently order code like:

- Global attributes/comments
- `use` from `core`
- `use` from external crates
- `mod` declarations (if applicable)
- `use` from current crate
- Rest of code

This makes the code easier to read/edit.

Signed-off-by: Joe Richey <joerichey@google.com>

Author: josephlr

src/block.rs

@@ -14,8 +14,7 @@
 
 use core::cell::RefCell;
 
-use crate::virtio::Error as VirtioError;
-use crate::virtio::VirtioTransport;
+use crate::virtio::{Error as VirtioError, VirtioTransport};
 
 const QUEUE_SIZE: usize = 16;
 

src/bzimage.rs

@@ -12,8 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use crate::fat;
-use fat::Read;
+use crate::fat::{self, Read};
 
 pub enum Error {
     FileError,

src/efi/alloc.rs

@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-const PAGE_SIZE: u64 = 4096;
-
 use r_efi::efi::{AllocateType, MemoryType, PhysicalAddress, Status, VirtualAddress};
 
+const PAGE_SIZE: u64 = 4096;
+
 // Copied from r_efi so we can do Default on it
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]

src/efi/block.rs

@@ -14,9 +14,11 @@
 
 use core::ffi::c_void;
 
-use r_efi::efi::{AllocateType, Guid, MemoryType, Status};
-use r_efi::protocols::device_path::Protocol as DevicePathProtocol;
-use r_efi::{eficall, eficall_abi};
+use r_efi::{
+    efi::{AllocateType, Guid, MemoryType, Status},
+    eficall, eficall_abi,
+    protocols::device_path::Protocol as DevicePathProtocol,
+};
 
 pub const PROTOCOL_GUID: Guid = Guid::from_fields(
     0x964e_5b21,

src/efi/console.rs

@@ -12,11 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use r_efi::efi::{Boolean, Char16, Event, Handle, Status};
-use r_efi::protocols::simple_text_input::InputKey;
-use r_efi::protocols::simple_text_input::Protocol as SimpleTextInputProtocol;
-use r_efi::protocols::simple_text_output::Mode as SimpleTextOutputMode;
-use r_efi::protocols::simple_text_output::Protocol as SimpleTextOutputProtocol;
+use r_efi::{
+    efi::{Boolean, Char16, Event, Handle, Status},
+    protocols::{
+        simple_text_input::{InputKey, Protocol as SimpleTextInputProtocol},
+        simple_text_output::{Mode as SimpleTextOutputMode, Protocol as SimpleTextOutputProtocol},
+    },
+};
 
 use super::{HandleType, HandleWrapper};
 

src/efi/file.rs

@@ -14,10 +14,13 @@
 
 use core::ffi::c_void;
 
-use r_efi::efi::{AllocateType, Char16, Guid, MemoryType, Status};
-use r_efi::protocols::device_path::Protocol as DevicePathProtocol;
-use r_efi::protocols::file::Protocol as FileProtocol;
-use r_efi::protocols::simple_file_system::Protocol as SimpleFileSystemProtocol;
+use r_efi::{
+    efi::{AllocateType, Char16, Guid, MemoryType, Status},
+    protocols::{
+        device_path::Protocol as DevicePathProtocol, file::Protocol as FileProtocol,
+        simple_file_system::Protocol as SimpleFileSystemProtocol,
+    },
+};
 
 #[repr(C)]
 pub struct FileDevicePathProtocol {

src/efi/mod.rs

@@ -12,25 +12,26 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+use core::ffi::c_void;
+
+use r_efi::{
+    efi::{
+        self, AllocateType, Boolean, CapsuleHeader, Char16, Event, EventNotify, Guid, Handle,
+        InterfaceType, LocateSearchType, MemoryDescriptor, MemoryType,
+        OpenProtocolInformationEntry, PhysicalAddress, ResetType, Status, Time, TimeCapabilities,
+        TimerDelay, Tpl,
+    },
+    protocols::{
+        device_path::Protocol as DevicePathProtocol, loaded_image::Protocol as LoadedImageProtocol,
+    },
+};
+use spin::Mutex;
+
 mod alloc;
 mod block;
 mod console;
 mod file;
 
-use spin::Mutex;
-
-use r_efi::efi;
-use r_efi::efi::{
-    AllocateType, Boolean, CapsuleHeader, Char16, Event, EventNotify, Guid, Handle, InterfaceType,
-    LocateSearchType, MemoryDescriptor, MemoryType, OpenProtocolInformationEntry, PhysicalAddress,
-    ResetType, Status, Time, TimeCapabilities, TimerDelay, Tpl,
-};
-
-use r_efi::protocols::device_path::Protocol as DevicePathProtocol;
-use r_efi::protocols::loaded_image::Protocol as LoadedImageProtocol;
-
-use core::ffi::c_void;
-
 use alloc::Allocator;
 
 #[derive(Copy, Clone, PartialEq)]

src/loader.rs

@@ -12,9 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use crate::bzimage;
-use crate::fat;
-use fat::Read;
+use crate::{
+    bzimage,
+    fat::{self, Read},
+};
 
 pub struct LoaderConfig {
     pub bzimage_path: [u8; 260],

src/logger.rs

@@ -16,9 +16,9 @@
 // from Philipp Oppermann
 
 use core::fmt;
-use spin::Mutex;
 
 use cpuio::Port;
+use spin::Mutex;
 
 pub static LOGGER: Mutex<Logger> = Mutex::new(Logger {
     port: unsafe { Port::new(0x3f8) },

src/main.rs

@@ -18,14 +18,14 @@
 #![cfg_attr(test, allow(unused_imports, dead_code))]
 #![cfg_attr(not(feature = "log-serial"), allow(unused_variables, unused_imports))]
 
+use core::panic::PanicInfo;
+
 #[macro_use]
 mod logger;
 
 #[macro_use]
 mod common;
 
-use core::panic::PanicInfo;
-
 mod block;
 mod bzimage;
 mod efi;