diff --git a/Cargo.toml b/Cargo.toml index f608a1a9..3ea0ec5f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -34,7 +34,7 @@ egui = { version = ">=0.24, <=0.27", optional = true, default-features = false } egui_extras = { version = ">=0.24, <=0.27", optional = true, default-features = false } [target.'cfg(any(target_os = "macos", target_os = "ios"))'.dependencies] -metal = { version = "0.27.0", default-features = false, features = ["link", "dispatch"], optional = true } +metal = { version = "0.28.0", git = "https://github.com/gfx-rs/metal-rs", rev = "0d6214f", default-features = false, features = ["link", "dispatch"], optional = true } [target.'cfg(windows)'.dependencies] # Only needed for public-winapi interop helpers @@ -96,6 +96,3 @@ metal = ["dep:metal"] public-winapi = ["dep:winapi"] default = ["d3d12", "vulkan"] - -[patch.crates-io] -metal = { git = "https://github.com/Traverse-Research/metal-rs", rev = "a354c33" } diff --git a/examples/d3d12-buffer.rs b/examples/d3d12-buffer.rs index 8ed69500..de626298 100644 --- a/examples/d3d12-buffer.rs +++ b/examples/d3d12-buffer.rs @@ -106,7 +106,7 @@ fn main() { ) }; - assert_eq!(hr, winerror::S_OK, "Failed to create DXGI factory",); + assert_eq!(hr, winerror::S_OK, "Failed to create DXGI factory"); dxgi_factory }; diff --git a/src/vulkan/mod.rs b/src/vulkan/mod.rs index 02b954c7..cff53633 100644 --- a/src/vulkan/mod.rs +++ b/src/vulkan/mod.rs @@ -105,7 +105,7 @@ pub struct AllocatorCreateDesc { /// let my_gpu_data: Vec = make_vertex_data(); /// ``` /// -/// Depending on how the data we're copying will be used, the vulkan device may have a minimum +/// Depending on how the data we're copying will be used, the Vulkan device may have a minimum /// alignment requirement for that data: /// /// ```ignore @@ -180,7 +180,7 @@ impl Allocation { /// /// [`Slab`]: presser::Slab // best to be explicit where the lifetime is coming from since we're doing unsafe things - // and relying on an inferred liftime type in the PhantomData below + // and relying on an inferred lifetime type in the PhantomData below #[allow(clippy::needless_lifetimes)] pub fn try_as_mapped_slab<'a>(&'a mut self) -> Option> { let mapped_ptr = self.mapped_ptr()?.cast().as_ptr();