Skip to content

Commit 6d6d14d

Browse files
committed
abi: s/VectorKind/SimdVectorKind
Renaming to remove any ambiguity as to what "vector" refers to in this context.
1 parent 6172975 commit 6d6d14d

1 file changed

Lines changed: 7 additions & 7 deletions

File tree

compiler/rustc_abi/src/layout.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ impl<Cx: HasDataLayout> LayoutCalculator<Cx> {
210210
VariantIdx: Idx,
211211
F: AsRef<LayoutData<FieldIdx, VariantIdx>> + fmt::Debug,
212212
{
213-
vector_type_layout(VectorKind::Scalable, self.cx.data_layout(), element, count)
213+
vector_type_layout(SimdVectorKind::Scalable, self.cx.data_layout(), element, count)
214214
}
215215

216216
pub fn simd_type<FieldIdx, VariantIdx, F>(
@@ -224,7 +224,7 @@ impl<Cx: HasDataLayout> LayoutCalculator<Cx> {
224224
VariantIdx: Idx,
225225
F: AsRef<LayoutData<FieldIdx, VariantIdx>> + fmt::Debug,
226226
{
227-
let kind = if repr_packed { VectorKind::PackedFixed } else { VectorKind::Fixed };
227+
let kind = if repr_packed { SimdVectorKind::PackedFixed } else { SimdVectorKind::Fixed };
228228
vector_type_layout(kind, self.cx.data_layout(), element, count)
229229
}
230230

@@ -1524,7 +1524,7 @@ impl<Cx: HasDataLayout> LayoutCalculator<Cx> {
15241524
}
15251525
}
15261526

1527-
enum VectorKind {
1527+
enum SimdVectorKind {
15281528
/// `#[rustc_scalable_vector]`
15291529
Scalable,
15301530
/// `#[repr(simd, packed)]`
@@ -1534,7 +1534,7 @@ enum VectorKind {
15341534
}
15351535

15361536
fn vector_type_layout<FieldIdx, VariantIdx, F>(
1537-
kind: VectorKind,
1537+
kind: SimdVectorKind,
15381538
dl: &TargetDataLayout,
15391539
element: F,
15401540
count: u64,
@@ -1559,16 +1559,16 @@ where
15591559
let size =
15601560
elt.size.checked_mul(count, dl).ok_or_else(|| LayoutCalculatorError::SizeOverflow)?;
15611561
let (repr, align) = match kind {
1562-
VectorKind::Scalable => {
1562+
SimdVectorKind::Scalable => {
15631563
(BackendRepr::ScalableVector { element, count }, dl.llvmlike_vector_align(size))
15641564
}
15651565
// Non-power-of-two vectors have padding up to the next power-of-two.
15661566
// If we're a packed repr, remove the padding while keeping the alignment as close
15671567
// to a vector as possible.
1568-
VectorKind::PackedFixed if !count.is_power_of_two() => {
1568+
SimdVectorKind::PackedFixed if !count.is_power_of_two() => {
15691569
(BackendRepr::Memory { sized: true }, Align::max_aligned_factor(size))
15701570
}
1571-
VectorKind::PackedFixed | VectorKind::Fixed => {
1571+
SimdVectorKind::PackedFixed | SimdVectorKind::Fixed => {
15721572
(BackendRepr::SimdVector { element, count }, dl.llvmlike_vector_align(size))
15731573
}
15741574
};

0 commit comments

Comments
 (0)