Fix Rust 1.79 lints and reformat imports (#237)

Author: MarijnS95

examples/d3d12-buffer-winrs.rs

@@ -1,24 +1,28 @@
 //! Example showcasing [`gpu-allocator`] with types and functions from the [`windows`] crate.
-use gpu_allocator::d3d12::{
-    AllocationCreateDesc, Allocator, AllocatorCreateDesc, ID3D12DeviceVersion, ResourceCategory,
+use gpu_allocator::{
+    d3d12::{
+        AllocationCreateDesc, Allocator, AllocatorCreateDesc, ID3D12DeviceVersion, ResourceCategory,
+    },
+    MemoryLocation,
 };
-use gpu_allocator::MemoryLocation;
 use log::*;
-use windows::core::{Interface, Result};
-use windows::Win32::{
-    Foundation::E_NOINTERFACE,
-    Graphics::{
-        Direct3D::{D3D_FEATURE_LEVEL_11_0, D3D_FEATURE_LEVEL_11_1, D3D_FEATURE_LEVEL_12_0},
-        Direct3D12::{
-            D3D12CreateDevice, ID3D12Device, ID3D12Resource,
-            D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT, D3D12_RESOURCE_DESC,
-            D3D12_RESOURCE_DIMENSION_BUFFER, D3D12_RESOURCE_FLAG_NONE, D3D12_RESOURCE_STATE_COMMON,
-            D3D12_TEXTURE_LAYOUT_ROW_MAJOR,
-        },
-        Dxgi::{
-            Common::{DXGI_FORMAT_UNKNOWN, DXGI_SAMPLE_DESC},
-            CreateDXGIFactory2, IDXGIAdapter4, IDXGIFactory6, DXGI_ADAPTER_FLAG3_SOFTWARE,
-            DXGI_ERROR_NOT_FOUND,
+use windows::{
+    core::{Interface, Result},
+    Win32::{
+        Foundation::E_NOINTERFACE,
+        Graphics::{
+            Direct3D::{D3D_FEATURE_LEVEL_11_0, D3D_FEATURE_LEVEL_11_1, D3D_FEATURE_LEVEL_12_0},
+            Direct3D12::{
+                D3D12CreateDevice, ID3D12Device, ID3D12Resource,
+                D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT, D3D12_RESOURCE_DESC,
+                D3D12_RESOURCE_DIMENSION_BUFFER, D3D12_RESOURCE_FLAG_NONE,
+                D3D12_RESOURCE_STATE_COMMON, D3D12_TEXTURE_LAYOUT_ROW_MAJOR,
+            },
+            Dxgi::{
+                Common::{DXGI_FORMAT_UNKNOWN, DXGI_SAMPLE_DESC},
+                CreateDXGIFactory2, IDXGIAdapter4, IDXGIFactory6, DXGI_ADAPTER_FLAG3_SOFTWARE,
+                DXGI_ERROR_NOT_FOUND,
+            },
         },
     },
 };

examples/d3d12-buffer.rs

@@ -1,19 +1,22 @@
 //! Example showcasing [`winapi`] interop with [`gpu-allocator`] which is driven by the [`windows`] crate.
-use winapi::shared::{dxgiformat, winerror};
-use winapi::um::{d3d12, d3dcommon};
-use winapi::Interface;
+use winapi::{
+    shared::{dxgiformat, winerror},
+    um::{d3d12, d3dcommon},
+    Interface,
+};
 
 mod all_dxgi {
     pub use winapi::shared::{dxgi1_3::*, dxgi1_6::*, dxgitype::*};
 }
 
-use log::*;
-
-use gpu_allocator::d3d12::{
-    AllocationCreateDesc, Allocator, AllocatorCreateDesc, ID3D12DeviceVersion, ResourceCategory,
-    ToWinapi, ToWindows,
+use gpu_allocator::{
+    d3d12::{
+        AllocationCreateDesc, Allocator, AllocatorCreateDesc, ID3D12DeviceVersion,
+        ResourceCategory, ToWinapi, ToWindows,
+    },
+    MemoryLocation,
 };
-use gpu_allocator::MemoryLocation;
+use log::*;
 
 fn create_d3d12_device(
     dxgi_factory: *mut all_dxgi::IDXGIFactory6,

examples/vulkan-buffer.rs

@@ -1,12 +1,11 @@
 use std::default::Default;
 
 use ash::vk;
-use log::info;
-
-use gpu_allocator::vulkan::{
-    AllocationCreateDesc, AllocationScheme, Allocator, AllocatorCreateDesc,
+use gpu_allocator::{
+    vulkan::{AllocationCreateDesc, AllocationScheme, Allocator, AllocatorCreateDesc},
+    MemoryLocation,
 };
-use gpu_allocator::MemoryLocation;
+use log::info;
 
 fn main() {
     env_logger::Builder::from_env(env_logger::Env::default().default_filter_or("trace")).init();

src/d3d12/mod.rs

@@ -1,19 +1,17 @@
-#![deny(clippy::unimplemented, clippy::unwrap_used, clippy::ok_expect)]
-
 use std::{backtrace::Backtrace, fmt, sync::Arc};
 
 use log::{debug, warn, Level};
-
 use windows::Win32::{
     Foundation::E_OUTOFMEMORY,
     Graphics::{Direct3D12::*, Dxgi::Common::DXGI_FORMAT},
 };
 
 #[cfg(feature = "public-winapi")]
 mod public_winapi {
-    use super::*;
     pub use winapi::um::d3d12 as winapi_d3d12;
 
+    use super::*;
+
     /// Trait similar to [`AsRef`]/[`AsMut`],
     pub trait ToWinapi<T> {
         fn as_winapi(&self) -> *const T;
@@ -84,9 +82,7 @@ mod visualizer;
 #[cfg(feature = "visualizer")]
 pub use visualizer::AllocatorVisualizer;
 
-use super::allocator;
-use super::allocator::AllocationType;
-
+use super::{allocator, allocator::AllocationType};
 use crate::{
     allocator::{AllocatorReport, MemoryBlockReport},
     AllocationError, AllocationSizes, AllocatorDebugSettings, MemoryLocation, Result,
@@ -197,10 +193,12 @@ impl<'a> AllocationCreateDesc<'a> {
         desc: &winapi_d3d12::D3D12_RESOURCE_DESC,
         name: &'a str,
         location: MemoryLocation,
-    ) -> AllocationCreateDesc<'a> {
+    ) -> Self {
         let device = device.as_windows();
         // Raw structs are binary-compatible
-        let desc = unsafe { std::mem::transmute(desc) };
+        let desc = unsafe {
+            std::mem::transmute::<&winapi_d3d12::D3D12_RESOURCE_DESC, &D3D12_RESOURCE_DESC>(desc)
+        };
         let allocation_info =
             unsafe { device.GetResourceAllocationInfo(0, std::slice::from_ref(desc)) };
         let resource_category: ResourceCategory = desc.into();
@@ -223,7 +221,7 @@ impl<'a> AllocationCreateDesc<'a> {
         desc: &D3D12_RESOURCE_DESC,
         name: &'a str,
         location: MemoryLocation,
-    ) -> AllocationCreateDesc<'a> {
+    ) -> Self {
         let allocation_info =
             unsafe { device.GetResourceAllocationInfo(0, std::slice::from_ref(desc)) };
         let resource_category: ResourceCategory = desc.into();

src/d3d12/visualizer.rs

@@ -1,13 +1,13 @@
 #![allow(clippy::new_without_default)]
 
+use windows::Win32::Graphics::Direct3D12::*;
+
 use super::Allocator;
 use crate::visualizer::{
     render_allocation_reports_ui, AllocationReportVisualizeSettings, ColorScheme,
     MemoryChunksVisualizationSettings,
 };
 
-use windows::Win32::Graphics::Direct3D12::*;
-
 struct AllocatorVisualizerBlockWindow {
     memory_type_index: usize,
     block_index: usize,

src/metal/mod.rs

@@ -1,11 +1,12 @@
 #![deny(clippy::unimplemented, clippy::unwrap_used, clippy::ok_expect)]
 use std::{backtrace::Backtrace, sync::Arc};
 
+use log::debug;
+
 use crate::{
     allocator::{self, AllocatorReport, MemoryBlockReport},
     AllocationError, AllocationSizes, AllocatorDebugSettings, MemoryLocation, Result,
 };
-use log::debug;
 
 fn memory_location_to_metal(location: MemoryLocation) -> metal::MTLResourceOptions {
     match location {

src/visualizer/memory_chunks.rs

@@ -2,9 +2,8 @@ use std::backtrace::BacktraceStatus;
 
 use egui::{Color32, DragValue, Rect, ScrollArea, Sense, Ui, Vec2};
 
-use crate::allocator::free_list_allocator::MemoryChunk;
-
 use super::ColorScheme;
+use crate::allocator::free_list_allocator::MemoryChunk;
 
 pub(crate) struct MemoryChunksVisualizationSettings {
     pub width_in_bytes: u64,

src/vulkan/mod.rs

@@ -2,13 +2,12 @@
 
 #[cfg(feature = "visualizer")]
 mod visualizer;
-#[cfg(feature = "visualizer")]
-pub use visualizer::AllocatorVisualizer;
-
 use std::{backtrace::Backtrace, fmt, marker::PhantomData, sync::Arc};
 
 use ash::vk;
 use log::{debug, Level};
+#[cfg(feature = "visualizer")]
+pub use visualizer::AllocatorVisualizer;
 
 use super::allocator;
 use crate::{