Skip to content

Commit acaf74c

Browse files
committed
Undo accidental subst->arg renames in builder/spirv_asm.
1 parent 9b587c1 commit acaf74c

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

crates/rustc_codegen_spirv/src/builder/spirv_asm.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -660,7 +660,7 @@ impl<'cx, 'tcx> Builder<'cx, 'tcx> {
660660
/// `leftover_operands` is used for `IndexComposite` patterns, if any exist.
661661
/// If the pattern isn't constraining enough to determine an unique type,
662662
/// `Err(Ambiguous)` is returned instead.
663-
fn arg_ty_pat(
663+
fn subst_ty_pat(
664664
cx: &CodegenCx<'_>,
665665
pat: &TyPat<'_>,
666666
ty_vars: &[Option<Word>],
@@ -673,23 +673,23 @@ impl<'cx, 'tcx> Builder<'cx, 'tcx> {
673673
},
674674

675675
TyPat::Pointer(_, pat) => SpirvType::Pointer {
676-
pointee: arg_ty_pat(cx, pat, ty_vars, leftover_operands)?,
676+
pointee: subst_ty_pat(cx, pat, ty_vars, leftover_operands)?,
677677
}
678678
.def(DUMMY_SP, cx),
679679

680680
TyPat::Vector4(pat) => SpirvType::Vector {
681-
element: arg_ty_pat(cx, pat, ty_vars, leftover_operands)?,
681+
element: subst_ty_pat(cx, pat, ty_vars, leftover_operands)?,
682682
count: 4,
683683
}
684684
.def(DUMMY_SP, cx),
685685

686686
TyPat::SampledImage(pat) => SpirvType::SampledImage {
687-
image_type: arg_ty_pat(cx, pat, ty_vars, leftover_operands)?,
687+
image_type: subst_ty_pat(cx, pat, ty_vars, leftover_operands)?,
688688
}
689689
.def(DUMMY_SP, cx),
690690

691691
TyPat::IndexComposite(pat) => {
692-
let mut ty =arg_ty_pat(cx, pat, ty_vars, leftover_operands)?;
692+
let mut ty = subst_ty_pat(cx, pat, ty_vars, leftover_operands)?;
693693
for index in leftover_operands {
694694
let index_to_usize = || match *index {
695695
// FIXME(eddyb) support more than just literals,
@@ -780,7 +780,7 @@ impl<'cx, 'tcx> Builder<'cx, 'tcx> {
780780
_ => return None,
781781
}
782782

783-
match arg_ty_pat(
783+
match subst_ty_pat(
784784
self,
785785
sig.output_type.unwrap(),
786786
&combined_ty_vars,

0 commit comments

Comments
 (0)