From 188aba26fcee9f1c367591b0ca7db33f8386d21b Mon Sep 17 00:00:00 2001
From: Eduard-Mihai Burtescu <eddyb@lyken.rs>
Date: Sat, 3 Jun 2023 08:09:58 +0300
Subject: [PATCH] Remove some now-obsolete `#[rustfmt::skip]` workarounds for
 `rustfmt` bugs.

---
 crates/spirv-std/src/image.rs             | 3 ---
 tests/ui/arch/execute_callable.rs         | 2 --
 tests/ui/arch/ray_query_initialize_khr.rs | 2 --
 tests/ui/arch/trace_ray_khr.rs            | 2 --
 4 files changed, 9 deletions(-)

diff --git a/crates/spirv-std/src/image.rs b/crates/spirv-std/src/image.rs
index 153442503a..0a9924dbd9 100644
--- a/crates/spirv-std/src/image.rs
+++ b/crates/spirv-std/src/image.rs
@@ -5,9 +5,6 @@ use crate::vector::VectorTruncateInto;
 #[cfg(target_arch = "spirv")]
 use core::arch::asm;
 
-// Rustfmt formats long marker trait impls over multiple lines which makes them
-// harder to read.
-#[rustfmt::skip]
 mod params;
 
 /// Contains extra image operands
diff --git a/tests/ui/arch/execute_callable.rs b/tests/ui/arch/execute_callable.rs
index dadd7bd963..41375a5153 100644
--- a/tests/ui/arch/execute_callable.rs
+++ b/tests/ui/arch/execute_callable.rs
@@ -4,8 +4,6 @@
 use spirv_std::spirv;
 
 #[spirv(ray_generation)]
-// Rustfmt will eat long attributes (https://github.com/rust-lang/rustfmt/issues/4579)
-#[rustfmt::skip]
 pub fn main(
     #[spirv(descriptor_set = 0, binding = 0)]
     acceleration_structure: &spirv_std::ray_tracing::AccelerationStructure,
diff --git a/tests/ui/arch/ray_query_initialize_khr.rs b/tests/ui/arch/ray_query_initialize_khr.rs
index 90b73b79f1..ac2e5f0fab 100644
--- a/tests/ui/arch/ray_query_initialize_khr.rs
+++ b/tests/ui/arch/ray_query_initialize_khr.rs
@@ -6,8 +6,6 @@ use spirv_std::ray_tracing::{AccelerationStructure, RayFlags, RayQuery};
 use spirv_std::spirv;
 
 #[spirv(fragment)]
-// Rustfmt eats long attributes <https://github.com/rust-lang/rustfmt/issues/4579>
-#[rustfmt::skip]
 pub fn main(
     #[spirv(descriptor_set = 0, binding = 0)] acceleration_structure: &AccelerationStructure,
     #[spirv(ray_payload)] payload: &mut Vec3,
diff --git a/tests/ui/arch/trace_ray_khr.rs b/tests/ui/arch/trace_ray_khr.rs
index 6401b469ab..f210a65c98 100644
--- a/tests/ui/arch/trace_ray_khr.rs
+++ b/tests/ui/arch/trace_ray_khr.rs
@@ -4,8 +4,6 @@
 use spirv_std::spirv;
 
 #[spirv(ray_generation)]
-// Rustfmt will eat long attributes (https://github.com/rust-lang/rustfmt/issues/4579)
-#[rustfmt::skip]
 pub fn main(
     #[spirv(descriptor_set = 0, binding = 0)]
     acceleration_structure: &spirv_std::ray_tracing::AccelerationStructure,