Skip to content

Commit

Permalink
Remove some now-obsolete #[rustfmt::skip] workarounds for rustfmt
Browse files Browse the repository at this point in the history
… bugs.
  • Loading branch information
eddyb committed Jun 3, 2023
1 parent 4a987f3 commit 188aba2
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 9 deletions.
3 changes: 0 additions & 3 deletions crates/spirv-std/src/image.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions tests/ui/arch/execute_callable.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 0 additions & 2 deletions tests/ui/arch/ray_query_initialize_khr.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 0 additions & 2 deletions tests/ui/arch/trace_ray_khr.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit 188aba2

Please sign in to comment.