diff --git a/src/front/wgsl/parse/ast.rs b/src/front/wgsl/parse/ast.rs index 34aeb21a1a..fca7457f05 100644 --- a/src/front/wgsl/parse/ast.rs +++ b/src/front/wgsl/parse/ast.rs @@ -1,5 +1,5 @@ use crate::front::wgsl::parse::number::Number; -use crate::{Arena, FastHashSet, Handle, Span}; +use crate::{Arena, FastIndexSet, Handle, Span}; use std::hash::Hash; #[derive(Debug, Default)] @@ -73,7 +73,7 @@ pub struct GlobalDecl<'a> { /// Names of all module-scope or predeclared objects this /// declaration uses. - pub dependencies: FastHashSet>, + pub dependencies: FastIndexSet>, } #[derive(Debug)] diff --git a/src/front/wgsl/parse/mod.rs b/src/front/wgsl/parse/mod.rs index 86dd12799d..325a8e690a 100644 --- a/src/front/wgsl/parse/mod.rs +++ b/src/front/wgsl/parse/mod.rs @@ -2,7 +2,7 @@ use crate::front::wgsl::error::{Error, ExpectedToken}; use crate::front::wgsl::parse::lexer::{Lexer, Token}; use crate::front::wgsl::parse::number::Number; use crate::front::SymbolTable; -use crate::{Arena, FastHashSet, Handle, ShaderStage, Span}; +use crate::{Arena, FastIndexSet, Handle, ShaderStage, Span}; pub mod ast; pub mod conv; @@ -51,7 +51,7 @@ struct ExpressionContext<'input, 'temp, 'out> { /// /// [`GlobalDecl`]: ast::GlobalDecl /// [`dependencies`]: ast::GlobalDecl::dependencies - unresolved: &'out mut FastHashSet>, + unresolved: &'out mut FastIndexSet>, } impl<'a> ExpressionContext<'a, '_, '_> { @@ -2076,7 +2076,7 @@ impl Parser { &mut self, lexer: &mut Lexer<'a>, out: &mut ast::TranslationUnit<'a>, - dependencies: &mut FastHashSet>, + dependencies: &mut FastIndexSet>, ) -> Result, Error<'a>> { self.push_rule_span(Rule::FunctionDecl, lexer); // read function name @@ -2238,7 +2238,7 @@ impl Parser { (None, None) => {} } - let mut dependencies = FastHashSet::default(); + let mut dependencies = FastIndexSet::default(); let mut ctx = ExpressionContext { expressions: &mut out.expressions, local_table: &mut SymbolTable::default(), diff --git a/tests/out/wgsl/module-scope.wgsl b/tests/out/wgsl/module-scope.wgsl index 141c28b500..3276a0a10a 100644 --- a/tests/out/wgsl/module-scope.wgsl +++ b/tests/out/wgsl/module-scope.wgsl @@ -9,14 +9,14 @@ var Texture: texture_2d; @group(0) @binding(1) var Sampler: sampler; -fn returns() -> S { - return S(Value); -} - fn statement() { return; } +fn returns() -> S { + return S(Value); +} + fn call() { statement(); let _e0 = returns();