From 5a4463266c6f414294f395807d5f7f1ce1fe8b7b Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Thu, 10 Aug 2023 18:44:05 +0200 Subject: [PATCH] [wgsl-in] Avoid conditional derive for tests --- src/front/wgsl/error.rs | 1 - src/front/wgsl/tests.rs | 7 ++++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/front/wgsl/error.rs b/src/front/wgsl/error.rs index d45cd5ba80..a3355f861a 100644 --- a/src/front/wgsl/error.rs +++ b/src/front/wgsl/error.rs @@ -136,7 +136,6 @@ pub enum InvalidAssignmentType { } #[derive(Clone, Debug)] -#[cfg_attr(test, derive(PartialEq))] pub enum Error<'a> { Unexpected(Span, ExpectedToken<'a>), UnexpectedComponents(Span), diff --git a/src/front/wgsl/tests.rs b/src/front/wgsl/tests.rs index 9bf08e2ca3..cabb6f80bb 100644 --- a/src/front/wgsl/tests.rs +++ b/src/front/wgsl/tests.rs @@ -528,11 +528,12 @@ fn parse_repeated_attributes() { let name_length = attribute.rfind('(').unwrap_or(attribute.len()) as u32; let span_start = shader.rfind(attribute).unwrap() as u32; let span_end = span_start + name_length; + let expected_span = Span::new(span_start, span_end); let result = Frontend::new().inner(&shader); - assert_eq!( + assert!(matches!( result.unwrap_err(), - Error::RepeatedAttribute(Span::new(span_start, span_end)) - ); + Error::RepeatedAttribute(span) if span == expected_span + )); } }