github/wgpu
1
1
Fork 0
mirror of https://github.com/gfx-rs/wgpu.git synced 2026-04-22 03:02:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

[naga wgsl-in] Reformat match statement for better patch stability.

Browse Source 
The large `match` statement in `Lowerer::construct` seems to flop back
and forth between two indentation levels as it's edited, making the
diffs hard to read. Rewrite it to use deferred initialization of
`expr`, so that `cargo fmt` doesn't have to decide whether or not to
put the `match` on the same line as `let expr`. This makes subsequent
diffs easier to read.
This commit is contained in:
Jim Blandy
2023-11-22 13:41:47 -08:00
committed by Teodor Tanasoaia
parent e75fb3c224
commit 9d20784223
1 changed files with 40 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
naga/src/front/wgsl/lower/construction.rs
View File

@@ -163,7 +163,8 @@ impl<'source, 'temp> Lowerer<'source, 'temp> {
// above can have mutable access to the type arena.
let constructor = constructor_h.borrow_inner(ctx.module);
let expr = match (components, constructor) {
let expr;
match (components, constructor) {
// Empty constructor
(Components::None, dst_ty) => match dst_ty {
Constructor::Type((result_ty, _)) => {
@@ -186,11 +187,13 @@ impl<'source, 'temp> Lowerer<'source, 'temp> {
..
},
Constructor::Type((_, &crate::TypeInner::Scalar(scalar))),
) => crate::Expression::As {
expr: component,
kind: scalar.kind,
convert: Some(scalar.width),
},
) => {
expr = crate::Expression::As {
expr: component,
kind: scalar.kind,
convert: Some(scalar.width),
};
}
// Vector conversion (vector -> vector)
(
@@ -206,11 +209,13 @@ impl<'source, 'temp> Lowerer<'source, 'temp> {
scalar: dst_scalar,
},
)),
) if dst_size == src_size => crate::Expression::As {
expr: component,
kind: dst_scalar.kind,
convert: Some(dst_scalar.width),
},
) if dst_size == src_size => {
expr = crate::Expression::As {
expr: component,
kind: dst_scalar.kind,
convert: Some(dst_scalar.width),
};
}
// Vector conversion (vector -> vector) - partial
(
@@ -247,11 +252,13 @@ impl<'source, 'temp> Lowerer<'source, 'temp> {
scalar: dst_scalar,
},
)),
) if dst_columns == src_columns && dst_rows == src_rows => crate::Expression::As {
expr: component,
kind: crate::ScalarKind::Float,
convert: Some(dst_scalar.width),
},
) if dst_columns == src_columns && dst_rows == src_rows => {
expr = crate::Expression::As {
expr: component,
kind: crate::ScalarKind::Float,
convert: Some(dst_scalar.width),
};
}
// Matrix conversion (matrix -> matrix) - partial
(
@@ -284,10 +291,12 @@ impl<'source, 'temp> Lowerer<'source, 'temp> {
..
},
Constructor::PartialVector { size },
) => crate::Expression::Splat {
size,
value: component,
},
) => {
expr = crate::Expression::Splat {
size,
value: component,
};
}
// Vector constructor (splat)
(
@@ -303,10 +312,12 @@ impl<'source, 'temp> Lowerer<'source, 'temp> {
scalar: dst_scalar,
},
)),
) if dst_scalar == src_scalar => crate::Expression::Splat {
size,
value: component,
},
) if dst_scalar == src_scalar => {
expr = crate::Expression::Splat {
size,
value: component,
};
}
// Vector constructor (by elements)
(
@@ -329,7 +340,7 @@ impl<'source, 'temp> Lowerer<'source, 'temp> {
) => {
let inner = crate::TypeInner::Vector { size, scalar };
let ty = ctx.ensure_type_exists(inner);
crate::Expression::Compose { ty, components }
expr = crate::Expression::Compose { ty, components };
}
// Matrix constructor (by elements)
@@ -377,7 +388,7 @@ impl<'source, 'temp> Lowerer<'source, 'temp> {
rows,
scalar,
});
crate::Expression::Compose { ty, components }
expr = crate::Expression::Compose { ty, components };
}
// Matrix constructor (by columns)
@@ -409,7 +420,7 @@ impl<'source, 'temp> Lowerer<'source, 'temp> {
rows,
scalar,
});
crate::Expression::Compose { ty, components }
expr = crate::Expression::Compose { ty, components };
}
// Array constructor - infer type
@@ -430,7 +441,7 @@ impl<'source, 'temp> Lowerer<'source, 'temp> {
};
let ty = ctx.ensure_type_exists(inner);
crate::Expression::Compose { ty, components }
expr = crate::Expression::Compose { ty, components };
}
// Array or Struct constructor
@@ -442,7 +453,7 @@ impl<'source, 'temp> Lowerer<'source, 'temp> {
)),
) => {
let components = components.into_components_vec();
crate::Expression::Compose { ty, components }
expr = crate::Expression::Compose { ty, components };
}
// ERRORS