Convert to 2018 edition of Rust

CHANGELOG_VULKANO.md

@@ -1,6 +1,6 @@
 # Unreleased
-- Added external memory support for `DeviceLocalBuffer` for `Linux`
 
+- **Breaking** Updated all code to Rust 2018 edition.
 - Fixed `shader!` generated descriptor set layouts for shader modules with multiple entrypoints.
   - **Breaking** Prefixed `shader!` generated descriptor set `Layout` structs with the name of the entrypoint the layout belongs to. For shaders generated from GLSL source, this means `Layout` has been renamed to `MainLayout`.
   - **Breaking** `shader!` will no longer generate descriptor information for variables that are declared but not used in a shader.
@@ -16,8 +16,8 @@
   - The `ImageViewAccess` trait is renamed to `ImageViewAbstract`, some methods added, removed or renamed. `ImageView` implements this trait.
   - `UnsafeImageView` no longer holds image usage information, nor does it check for valid usage.
 - Replaced deprecated `compare_and_swap` with `compare_exchange`.
-
 - Allow `const` usage of features and `BufferUsage`
+- Added external memory support for `DeviceLocalBuffer` for `Linux`
 
 # Version 0.21.0 (2021-03-05)
 

vk-sys/Cargo.toml

@@ -1,6 +1,7 @@
 [package]
 name = "vk-sys"
 version = "0.6.0"
+edition = "2018"
 authors = ["Pierre Krieger <pierre.krieger1708@gmail.com>", "The vulkano contributors"]
 repository = "https://github.com/vulkano-rs/vulkano"
 description = "Bindings for the Vulkan graphics API"

vulkano/Cargo.toml

@@ -1,6 +1,7 @@
 [package]
 name = "vulkano"
 version = "0.21.0"
+edition = "2018"
 authors = ["Pierre Krieger <pierre.krieger1708@gmail.com>", "The vulkano contributors"]
 repository = "https://github.com/vulkano-rs/vulkano"
 description = "Safe wrapper for the Vulkan graphics API"

vulkano/src/buffer/cpu_access.rs

@@ -31,34 +31,34 @@ use std::sync::atomic::AtomicUsize;
 use std::sync::atomic::Ordering;
 use std::sync::Arc;
 
-use buffer::sys::BufferCreationError;
-use buffer::sys::SparseLevel;
-use buffer::sys::UnsafeBuffer;
-use buffer::traits::BufferAccess;
-use buffer::traits::BufferInner;
-use buffer::traits::TypedBufferAccess;
-use buffer::BufferUsage;
-use device::Device;
-use device::DeviceOwned;
-use device::Queue;
-use image::ImageAccess;
-use instance::QueueFamily;
-use memory::pool::AllocFromRequirementsFilter;
-use memory::pool::AllocLayout;
-use memory::pool::MappingRequirement;
-use memory::pool::MemoryPool;
-use memory::pool::MemoryPoolAlloc;
-use memory::pool::PotentialDedicatedAllocation;
-use memory::pool::StdMemoryPoolAlloc;
-use memory::Content;
-use memory::CpuAccess as MemCpuAccess;
-use memory::DedicatedAlloc;
-use memory::DeviceMemoryAllocError;
+use crate::buffer::sys::BufferCreationError;
+use crate::buffer::sys::SparseLevel;
+use crate::buffer::sys::UnsafeBuffer;
+use crate::buffer::traits::BufferAccess;
+use crate::buffer::traits::BufferInner;
+use crate::buffer::traits::TypedBufferAccess;
+use crate::buffer::BufferUsage;
+use crate::device::Device;
+use crate::device::DeviceOwned;
+use crate::device::Queue;
+use crate::image::ImageAccess;
+use crate::instance::QueueFamily;
+use crate::memory::pool::AllocFromRequirementsFilter;
+use crate::memory::pool::AllocLayout;
+use crate::memory::pool::MappingRequirement;
+use crate::memory::pool::MemoryPool;
+use crate::memory::pool::MemoryPoolAlloc;
+use crate::memory::pool::PotentialDedicatedAllocation;
+use crate::memory::pool::StdMemoryPoolAlloc;
+use crate::memory::Content;
+use crate::memory::CpuAccess as MemCpuAccess;
+use crate::memory::DedicatedAlloc;
+use crate::memory::DeviceMemoryAllocError;
 use parking_lot::RwLock;
 use parking_lot::RwLockReadGuard;
 use parking_lot::RwLockWriteGuard;
-use sync::AccessError;
-use sync::Sharing;
+use crate::sync::AccessError;
+use crate::sync::Sharing;
 
 /// Buffer whose content is accessible by the CPU.
 ///
@@ -653,7 +653,7 @@ impl fmt::Display for WriteLockError {
 
 #[cfg(test)]
 mod tests {
-    use buffer::{BufferUsage, CpuAccessibleBuffer};
+    use crate::buffer::{BufferUsage, CpuAccessibleBuffer};
 
     #[test]
     fn create_empty_buffer() {

vulkano/src/buffer/cpu_pool.rs

@@ -20,30 +20,30 @@ use std::sync::Arc;
 use std::sync::Mutex;
 use std::sync::MutexGuard;
 
-use buffer::sys::BufferCreationError;
-use buffer::sys::SparseLevel;
-use buffer::sys::UnsafeBuffer;
-use buffer::traits::BufferAccess;
-use buffer::traits::BufferInner;
-use buffer::traits::TypedBufferAccess;
-use buffer::BufferUsage;
-use device::Device;
-use device::DeviceOwned;
-use device::Queue;
-use image::ImageAccess;
-use memory::pool::AllocFromRequirementsFilter;
-use memory::pool::AllocLayout;
-use memory::pool::MappingRequirement;
-use memory::pool::MemoryPool;
-use memory::pool::MemoryPoolAlloc;
-use memory::pool::PotentialDedicatedAllocation;
-use memory::pool::StdMemoryPool;
-use memory::DedicatedAlloc;
-use memory::DeviceMemoryAllocError;
-use sync::AccessError;
-use sync::Sharing;
-
-use OomError;
+use crate::buffer::sys::BufferCreationError;
+use crate::buffer::sys::SparseLevel;
+use crate::buffer::sys::UnsafeBuffer;
+use crate::buffer::traits::BufferAccess;
+use crate::buffer::traits::BufferInner;
+use crate::buffer::traits::TypedBufferAccess;
+use crate::buffer::BufferUsage;
+use crate::device::Device;
+use crate::device::DeviceOwned;
+use crate::device::Queue;
+use crate::image::ImageAccess;
+use crate::memory::pool::AllocFromRequirementsFilter;
+use crate::memory::pool::AllocLayout;
+use crate::memory::pool::MappingRequirement;
+use crate::memory::pool::MemoryPool;
+use crate::memory::pool::MemoryPoolAlloc;
+use crate::memory::pool::PotentialDedicatedAllocation;
+use crate::memory::pool::StdMemoryPool;
+use crate::memory::DedicatedAlloc;
+use crate::memory::DeviceMemoryAllocError;
+use crate::sync::AccessError;
+use crate::sync::Sharing;
+
+use crate::OomError;
 
 // TODO: Add `CpuBufferPoolSubbuffer::read` to read the content of a subbuffer.
 //       But that's hard to do because we must prevent `increase_gpu_lock` from working while a
@@ -876,7 +876,7 @@ where
 
 #[cfg(test)]
 mod tests {
-    use buffer::CpuBufferPool;
+    use crate::buffer::CpuBufferPool;
     use std::mem;
 
     #[test]

vulkano/src/buffer/device_local.rs

@@ -21,30 +21,30 @@ use std::mem;
 use std::sync::Arc;
 use std::sync::Mutex;
 
-use buffer::sys::BufferCreationError;
-use buffer::sys::SparseLevel;
-use buffer::sys::UnsafeBuffer;
-use buffer::traits::BufferAccess;
-use buffer::traits::BufferInner;
-use buffer::traits::TypedBufferAccess;
-use buffer::BufferUsage;
-use device::Device;
-use device::DeviceOwned;
-use device::Queue;
-use image::ImageAccess;
-use instance::QueueFamily;
-use memory::pool::AllocFromRequirementsFilter;
-use memory::pool::AllocLayout;
-use memory::pool::MappingRequirement;
-use memory::pool::MemoryPool;
-use memory::pool::MemoryPoolAlloc;
-use memory::pool::PotentialDedicatedAllocation;
-use memory::pool::StdMemoryPoolAlloc;
-use memory::{DedicatedAlloc, MemoryRequirements};
-use memory::{DeviceMemoryAllocError, ExternalMemoryHandleType};
+use crate::buffer::sys::BufferCreationError;
+use crate::buffer::sys::SparseLevel;
+use crate::buffer::sys::UnsafeBuffer;
+use crate::buffer::traits::BufferAccess;
+use crate::buffer::traits::BufferInner;
+use crate::buffer::traits::TypedBufferAccess;
+use crate::buffer::BufferUsage;
+use crate::device::Device;
+use crate::device::DeviceOwned;
+use crate::device::Queue;
+use crate::image::ImageAccess;
+use crate::instance::QueueFamily;
+use crate::memory::pool::AllocFromRequirementsFilter;
+use crate::memory::pool::AllocLayout;
+use crate::memory::pool::MappingRequirement;
+use crate::memory::pool::MemoryPool;
+use crate::memory::pool::MemoryPoolAlloc;
+use crate::memory::pool::PotentialDedicatedAllocation;
+use crate::memory::pool::StdMemoryPoolAlloc;
+use crate::memory::{DedicatedAlloc, MemoryRequirements};
+use crate::memory::{DeviceMemoryAllocError, ExternalMemoryHandleType};
 use std::fs::File;
-use sync::AccessError;
-use sync::Sharing;
+use crate::sync::AccessError;
+use crate::sync::Sharing;
 
 /// Buffer whose content is in device-local memory.
 ///

vulkano/src/buffer/immutable.rs

@@ -27,35 +27,35 @@ use std::sync::atomic::AtomicBool;
 use std::sync::atomic::Ordering;
 use std::sync::Arc;
 
-use buffer::sys::BufferCreationError;
-use buffer::sys::SparseLevel;
-use buffer::sys::UnsafeBuffer;
-use buffer::traits::BufferAccess;
-use buffer::traits::BufferInner;
-use buffer::traits::TypedBufferAccess;
-use buffer::BufferUsage;
-use buffer::CpuAccessibleBuffer;
-use command_buffer::AutoCommandBuffer;
-use command_buffer::AutoCommandBufferBuilder;
-use command_buffer::CommandBuffer;
-use command_buffer::CommandBufferExecFuture;
-use device::Device;
-use device::DeviceOwned;
-use device::Queue;
-use image::ImageAccess;
-use instance::QueueFamily;
-use memory::pool::AllocFromRequirementsFilter;
-use memory::pool::AllocLayout;
-use memory::pool::MappingRequirement;
-use memory::pool::MemoryPool;
-use memory::pool::MemoryPoolAlloc;
-use memory::pool::PotentialDedicatedAllocation;
-use memory::pool::StdMemoryPoolAlloc;
-use memory::DedicatedAlloc;
-use memory::DeviceMemoryAllocError;
-use sync::AccessError;
-use sync::NowFuture;
-use sync::Sharing;
+use crate::buffer::sys::BufferCreationError;
+use crate::buffer::sys::SparseLevel;
+use crate::buffer::sys::UnsafeBuffer;
+use crate::buffer::traits::BufferAccess;
+use crate::buffer::traits::BufferInner;
+use crate::buffer::traits::TypedBufferAccess;
+use crate::buffer::BufferUsage;
+use crate::buffer::CpuAccessibleBuffer;
+use crate::command_buffer::AutoCommandBuffer;
+use crate::command_buffer::AutoCommandBufferBuilder;
+use crate::command_buffer::CommandBuffer;
+use crate::command_buffer::CommandBufferExecFuture;
+use crate::device::Device;
+use crate::device::DeviceOwned;
+use crate::device::Queue;
+use crate::image::ImageAccess;
+use crate::instance::QueueFamily;
+use crate::memory::pool::AllocFromRequirementsFilter;
+use crate::memory::pool::AllocLayout;
+use crate::memory::pool::MappingRequirement;
+use crate::memory::pool::MemoryPool;
+use crate::memory::pool::MemoryPoolAlloc;
+use crate::memory::pool::PotentialDedicatedAllocation;
+use crate::memory::pool::StdMemoryPoolAlloc;
+use crate::memory::DedicatedAlloc;
+use crate::memory::DeviceMemoryAllocError;
+use crate::sync::AccessError;
+use crate::sync::NowFuture;
+use crate::sync::Sharing;
 
 /// Buffer that is written once then read for as long as it is alive.
 // TODO: implement Debug
@@ -531,12 +531,12 @@ impl<T: ?Sized, A> Hash for ImmutableBufferInitialization<T, A> {
 
 #[cfg(test)]
 mod tests {
-    use buffer::cpu_access::CpuAccessibleBuffer;
-    use buffer::immutable::ImmutableBuffer;
-    use buffer::BufferUsage;
-    use command_buffer::AutoCommandBufferBuilder;
-    use command_buffer::CommandBuffer;
-    use sync::GpuFuture;
+    use crate::buffer::cpu_access::CpuAccessibleBuffer;
+    use crate::buffer::immutable::ImmutableBuffer;
+    use crate::buffer::BufferUsage;
+    use crate::command_buffer::AutoCommandBufferBuilder;
+    use crate::command_buffer::CommandBuffer;
+    use crate::sync::GpuFuture;
 
     #[test]
     fn from_data_working() {

vulkano/src/buffer/slice.rs

@@ -15,14 +15,14 @@ use std::mem::MaybeUninit;
 use std::ops::Range;
 use std::sync::Arc;
 
-use buffer::traits::BufferAccess;
-use buffer::traits::BufferInner;
-use buffer::traits::TypedBufferAccess;
-use device::Device;
-use device::DeviceOwned;
-use device::Queue;
-use image::ImageAccess;
-use sync::AccessError;
+use crate::buffer::traits::BufferAccess;
+use crate::buffer::traits::BufferInner;
+use crate::buffer::traits::TypedBufferAccess;
+use crate::device::Device;
+use crate::device::DeviceOwned;
+use crate::device::Queue;
+use crate::image::ImageAccess;
+use crate::sync::AccessError;
 
 /// A subpart of a buffer.
 ///

vulkano/src/buffer/sys.rs

@@ -34,19 +34,19 @@ use std::mem::MaybeUninit;
 use std::ptr;
 use std::sync::Arc;
 
-use buffer::BufferUsage;
-use device::Device;
-use device::DeviceOwned;
-use memory::DeviceMemory;
-use memory::DeviceMemoryAllocError;
-use memory::MemoryRequirements;
-use sync::Sharing;
-
-use check_errors;
-use vk;
-use Error;
-use OomError;
-use VulkanObject;
+use crate::buffer::BufferUsage;
+use crate::device::Device;
+use crate::device::DeviceOwned;
+use crate::memory::DeviceMemory;
+use crate::memory::DeviceMemoryAllocError;
+use crate::memory::MemoryRequirements;
+use crate::sync::Sharing;
+
+use crate::check_errors;
+use crate::vk;
+use crate::Error;
+use crate::OomError;
+use crate::VulkanObject;
 
 /// Data storage in a GPU-accessible location.
 pub struct UnsafeBuffer {
@@ -520,9 +520,9 @@ mod tests {
     use super::SparseLevel;
     use super::UnsafeBuffer;
 
-    use device::Device;
-    use device::DeviceOwned;
-    use sync::Sharing;
+    use crate::device::Device;
+    use crate::device::DeviceOwned;
+    use crate::sync::Sharing;
 
     #[test]
     fn create() {

vulkano/src/buffer/traits.rs

@@ -13,15 +13,15 @@ use std::num::NonZeroU64;
 use std::ops::Range;
 use std::ptr;
 
-use buffer::sys::{DeviceAddressUsageNotEnabledError, UnsafeBuffer};
-use buffer::BufferSlice;
-use device::DeviceOwned;
-use device::Queue;
-use image::ImageAccess;
-use memory::Content;
-use sync::AccessError;
-
-use {vk, SafeDeref, VulkanObject};
+use crate::buffer::sys::{DeviceAddressUsageNotEnabledError, UnsafeBuffer};
+use crate::buffer::BufferSlice;
+use crate::device::DeviceOwned;
+use crate::device::Queue;
+use crate::image::ImageAccess;
+use crate::memory::Content;
+use crate::sync::AccessError;
+
+use crate::{vk, SafeDeref, VulkanObject};
 
 /// Trait for objects that represent a way for the GPU to have access to a buffer or a slice of a
 /// buffer.