From b61298a88466c9576ae417e2f5056b4949a26fde Mon Sep 17 00:00:00 2001 From: porky11 Date: Sat, 12 Jan 2019 20:11:27 +0100 Subject: [PATCH] remove some unnecessary and --- wgpu-native/src/binding_model.rs | 2 -- wgpu-native/src/command/allocator.rs | 2 +- wgpu-native/src/command/compute.rs | 1 - wgpu-native/src/command/mod.rs | 2 +- wgpu-native/src/command/render.rs | 1 - wgpu-native/src/conv.rs | 2 -- wgpu-native/src/instance.rs | 2 +- wgpu-native/src/lib.rs | 1 - wgpu-native/src/pipeline.rs | 1 - wgpu-native/src/resource.rs | 2 -- 10 files changed, 3 insertions(+), 13 deletions(-) diff --git a/wgpu-native/src/binding_model.rs b/wgpu-native/src/binding_model.rs index 247b7458c..e2ff7aeb8 100644 --- a/wgpu-native/src/binding_model.rs +++ b/wgpu-native/src/binding_model.rs @@ -1,5 +1,3 @@ -use hal; - use crate::{BindGroupLayoutId, BufferId, SamplerId, TextureViewId}; bitflags! { diff --git a/wgpu-native/src/command/allocator.rs b/wgpu-native/src/command/allocator.rs index 3d594e74a..886e4a722 100644 --- a/wgpu-native/src/command/allocator.rs +++ b/wgpu-native/src/command/allocator.rs @@ -4,7 +4,7 @@ use crate::{DeviceId, LifeGuard, Stored}; use hal::command::RawCommandBuffer; use hal::pool::RawCommandPool; -use hal::{self, Device}; +use hal::Device; use std::collections::HashMap; //TODO: use `parking_lot::Mutex`? diff --git a/wgpu-native/src/command/compute.rs b/wgpu-native/src/command/compute.rs index 3206efbd9..477e29f31 100644 --- a/wgpu-native/src/command/compute.rs +++ b/wgpu-native/src/command/compute.rs @@ -1,7 +1,6 @@ use crate::registry::{Items, HUB}; use crate::{BindGroupId, CommandBufferId, ComputePassId, ComputePipelineId, Stored}; -use hal; use hal::command::RawCommandBuffer; use std::iter; diff --git a/wgpu-native/src/command/mod.rs b/wgpu-native/src/command/mod.rs index 6ec2e158b..f07a2c8bf 100644 --- a/wgpu-native/src/command/mod.rs +++ b/wgpu-native/src/command/mod.rs @@ -7,7 +7,7 @@ pub use self::compute::*; pub use self::render::*; use hal::command::RawCommandBuffer; -use hal::{self, Device}; +use hal::Device; use crate::device::{FramebufferKey, RenderPassKey}; use crate::registry::{Items, HUB}; diff --git a/wgpu-native/src/command/render.rs b/wgpu-native/src/command/render.rs index 780f84519..4c9d8159c 100644 --- a/wgpu-native/src/command/render.rs +++ b/wgpu-native/src/command/render.rs @@ -2,7 +2,6 @@ use crate::registry::{Items, HUB}; use crate::track::{BufferTracker, TextureTracker}; use crate::{CommandBuffer, CommandBufferId, RenderPassId, Stored}; -use hal; use hal::command::RawCommandBuffer; pub struct RenderPass { diff --git a/wgpu-native/src/conv.rs b/wgpu-native/src/conv.rs index d77d24006..0838f3a75 100644 --- a/wgpu-native/src/conv.rs +++ b/wgpu-native/src/conv.rs @@ -1,5 +1,3 @@ -use hal; - use crate::{binding_model, command, pipeline, resource, Color, Extent3d}; pub fn map_buffer_usage( diff --git a/wgpu-native/src/instance.rs b/wgpu-native/src/instance.rs index a181f94e2..2cba38c1e 100644 --- a/wgpu-native/src/instance.rs +++ b/wgpu-native/src/instance.rs @@ -1,4 +1,4 @@ -use hal::{self, Instance as _Instance, PhysicalDevice as _PhysicalDevice}; +use hal::{Instance as _Instance, PhysicalDevice as _PhysicalDevice}; use crate::registry::{Items, HUB}; use crate::{AdapterId, Device, DeviceId, InstanceId}; diff --git a/wgpu-native/src/lib.rs b/wgpu-native/src/lib.rs index 064285221..df265bd5c 100644 --- a/wgpu-native/src/lib.rs +++ b/wgpu-native/src/lib.rs @@ -4,7 +4,6 @@ extern crate bitflags; extern crate lazy_static; #[macro_use] extern crate log; -extern crate parking_lot; #[cfg(feature = "gfx-backend-dx12")] extern crate gfx_backend_dx12 as back; diff --git a/wgpu-native/src/pipeline.rs b/wgpu-native/src/pipeline.rs index b56728f06..70b40a9b0 100644 --- a/wgpu-native/src/pipeline.rs +++ b/wgpu-native/src/pipeline.rs @@ -1,4 +1,3 @@ -use hal; use crate::resource; use crate::{BlendStateId, ByteArray, DepthStencilStateId, PipelineLayoutId, ShaderModuleId}; diff --git a/wgpu-native/src/resource.rs b/wgpu-native/src/resource.rs index 3799f17c9..e91e3c33b 100644 --- a/wgpu-native/src/resource.rs +++ b/wgpu-native/src/resource.rs @@ -1,7 +1,5 @@ use crate::{DeviceId, Extent3d, LifeGuard, Stored, TextureId}; -use hal; - bitflags! { #[repr(transparent)] pub struct BufferUsageFlags: u32 {