Format use consistently

Most of the project uses the style of only merging imports from the same
module. Normally this isn't handled by `cargo fmt`, so there are some
inconsistencies. There's an unstable option [1] to rustfmt to make imports
consistent, so as a one-time operation apply that to all source files:

```
cargo fmt --all -- --config imports_granularity=Module
```

[1]: https://github.com/rust-lang/rustfmt/blob/master/Configurations.md#module

Author: nicholasbishop

uefi-macros/src/lib.rs

@@ -6,9 +6,10 @@ use proc_macro::TokenStream;
 
 use proc_macro2::{TokenStream as TokenStream2, TokenTree};
 use quote::{quote, quote_spanned, ToTokens, TokenStreamExt};
+use syn::spanned::Spanned;
 use syn::{
-    parse_macro_input, parse_quote, spanned::Spanned, Error, Fields, FnArg, Ident, ItemFn,
-    ItemStruct, LitStr, Pat, Visibility,
+    parse_macro_input, parse_quote, Error, Fields, FnArg, Ident, ItemFn, ItemStruct, LitStr, Pat,
+    Visibility,
 };
 
 macro_rules! err {

uefi-test-runner/src/proto/device_path.rs

@@ -1,5 +1,6 @@
 use uefi::prelude::*;
-use uefi::proto::device_path::{text::*, DevicePath};
+use uefi::proto::device_path::text::*;
+use uefi::proto::device_path::DevicePath;
 use uefi::proto::loaded_image::LoadedImage;
 use uefi::table::boot::BootServices;
 

uefi-test-runner/src/proto/network/pxe.rs

@@ -1,11 +1,7 @@
-use uefi::{
-    prelude::BootServices,
-    proto::network::{
-        pxe::{BaseCode, DhcpV4Packet, IpFilter, IpFilters, UdpOpFlags},
-        IpAddress,
-    },
-    CStr8,
-};
+use uefi::prelude::BootServices;
+use uefi::proto::network::pxe::{BaseCode, DhcpV4Packet, IpFilter, IpFilters, UdpOpFlags};
+use uefi::proto::network::IpAddress;
+use uefi::CStr8;
 
 pub fn test(bt: &BootServices) {
     // Skip the test if the `pxe` feature is not enabled.

uefi-test-runner/src/runtime/vars.rs

@@ -1,8 +1,7 @@
 use log::info;
-use uefi::guid;
 use uefi::prelude::*;
 use uefi::table::runtime::{VariableAttributes, VariableVendor};
-use uefi::Status;
+use uefi::{guid, Status};
 
 fn test_variables(rt: &RuntimeServices) {
     let name = cstr16!("UefiRsTestVar");

uefi/src/data_types/mod.rs

@@ -2,7 +2,8 @@
 //!
 //! This module defines the basic data types that are used throughout uefi-rs
 
-use core::{ffi::c_void, ptr::NonNull};
+use core::ffi::c_void;
+use core::ptr::NonNull;
 
 /// Opaque handle to an UEFI entity (protocol, image...), guaranteed to be non-null.
 ///
@@ -121,8 +122,7 @@ pub type PhysicalAddress = u64;
 pub type VirtualAddress = u64;
 
 mod guid;
-pub use self::guid::Guid;
-pub use self::guid::Identify;
+pub use self::guid::{Guid, Identify};
 
 pub mod chars;
 pub use self::chars::{Char16, Char8};

uefi/src/data_types/owned_strs.rs

@@ -5,8 +5,7 @@ use crate::data_types::UnalignedSlice;
 use crate::polyfill::vec_into_raw_parts;
 use alloc::borrow::{Borrow, ToOwned};
 use alloc::vec::Vec;
-use core::fmt;
-use core::ops;
+use core::{fmt, ops};
 
 /// Error returned by [`CString16::try_from::<&str>`].
 #[derive(Clone, Copy, Debug, Eq, PartialEq)]

uefi/src/data_types/strs.rs

@@ -2,11 +2,10 @@ use super::chars::{Char16, Char8, NUL_16, NUL_8};
 use super::UnalignedSlice;
 use crate::polyfill::maybe_uninit_slice_assume_init_ref;
 use core::ffi::CStr;
-use core::fmt;
 use core::iter::Iterator;
 use core::mem::MaybeUninit;
 use core::result::Result;
-use core::slice;
+use core::{fmt, slice};
 
 #[cfg(feature = "alloc")]
 use super::CString16;

uefi/src/lib.rs

@@ -96,8 +96,7 @@ extern crate self as uefi;
 pub mod data_types;
 #[cfg(feature = "alloc")]
 pub use self::data_types::CString16;
-pub use self::data_types::Identify;
-pub use self::data_types::{CStr16, CStr8, Char16, Char8, Event, Guid, Handle};
+pub use self::data_types::{CStr16, CStr8, Char16, Char8, Event, Guid, Handle, Identify};
 pub use uefi_macros::{cstr16, cstr8, entry, guid};
 
 mod result;

uefi/src/mem.rs

@@ -1,7 +1,6 @@
 //! This is a utility module with helper methods for allocations/memory.
 
-use crate::ResultExt;
-use crate::{Result, Status};
+use crate::{Result, ResultExt, Status};
 use ::alloc::boxed::Box;
 use core::alloc::Layout;
 use core::fmt::Debug;

uefi/src/proto/console/gop.rs

@@ -55,8 +55,7 @@ use crate::util::usize_from_u32;
 use crate::{Result, Status};
 use core::fmt::{Debug, Formatter};
 use core::marker::PhantomData;
-use core::mem;
-use core::ptr;
+use core::{mem, ptr};
 
 /// Provides access to the video hardware's frame buffer.
 ///