Skip to content

Commit 37a472c

Browse files
authored
Replace code with naga built-in (bevyengine#85)
naga::Expression now implements PartialEq, which lets us get rid of this code :D Looks like @robtfm 's commit is now paying off nicely gfx-rs/wgpu@d0d3a2e
1 parent 33e57e4 commit 37a472c

File tree

3 files changed

+1
-271
lines changed

3 files changed

+1
-271
lines changed

src/compose/mod.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,6 @@ pub mod parse_imports;
146146
pub mod preprocess;
147147
mod test;
148148
pub mod tokenizer;
149-
pub mod util;
150149

151150
#[derive(Hash, PartialEq, Eq, Clone, Copy, Debug, Default)]
152151
pub enum ShaderLanguage {

src/compose/util.rs

Lines changed: 0 additions & 267 deletions
This file was deleted.

src/derive.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ use naga::{
66
};
77
use std::{cell::RefCell, rc::Rc};
88

9-
use crate::compose::util::expression_eq;
10-
119
#[derive(Debug, Default)]
1210
pub struct DerivedModule<'a> {
1311
shader: Option<&'a Module>,
@@ -602,7 +600,7 @@ impl<'a> DerivedModule<'a> {
602600
new_expressions.borrow_mut().fetch_if_or_append(
603601
expr,
604602
self.map_span(span),
605-
expression_eq,
603+
|lhs, rhs| lhs == rhs,
606604
)
607605
} else {
608606
new_expressions

0 commit comments

Comments
 (0)