Skip to content

Commit 9157634

Browse files
cpetigcpetig
committed
fixed_(size is now length)_list
1 parent e7522d3 commit 9157634

9 files changed

Lines changed: 28 additions & 29 deletions

File tree

‎crates/c-api/src/component/val.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ impl From<&wasmtime_component_val_t> for Val {
322322
wasmtime_component_val_t::Flags(x) => Val::Flags(x.into()),
323323
wasmtime_component_val_t::Map(x) => Val::Map(x.into()),
324324
wasmtime_component_val_t::Resource(x) => Val::Resource(x.resource),
325-
wasmtime_component_val_t::FixedSizeList(x) => Val::FixedSizeList(x.into()),
325+
wasmtime_component_val_t::FixedLengthList(x) => Val::FixedLengthList(x.into()),
326326
}
327327
}
328328
}
@@ -365,7 +365,7 @@ impl From<&Val> for wasmtime_component_val_t {
365365
Val::Future(_) => todo!(),
366366
Val::Stream(_) => todo!(),
367367
Val::ErrorContext(_) => todo!(),
368-
Val::FixedSizeList(ty) => wasmtime_component_val_t::FixedSizeList(
368+
Val::FixedLengthList(ty) => wasmtime_component_val_t::FixedLengthList(
369369
wasmtime_component_vallist_t::from(ty.as_ref()),
370370
),
371371
}

‎crates/environ/src/component/types.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -752,7 +752,7 @@ impl CanonicalAbiInfo {
752752
}
753753

754754
/// Returns the abi for a fixed size list
755-
pub const fn fixed_size_list_static(
755+
pub const fn fixed_length_list_static(
756756
element: &CanonicalAbiInfo,
757757
count: u32,
758758
) -> CanonicalAbiInfo {

‎crates/fuzzing/src/oracles/component_api.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ fn arbitrary_val(
138138
})
139139
.collect::<arbitrary::Result<_>>()?,
140140
),
141-
Type::FixedSizeList(list) => Val::FixedSizeList(
141+
Type::FixedLengthList(list) => Val::FixedLengthList(
142142
(0..list.size())
143143
.map(|_| arbitrary_val(&list.ty(), input))
144144
.collect::<arbitrary::Result<_>>()?,

‎crates/wasmtime/src/runtime/component/func/typed.rs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2976,11 +2976,11 @@ where
29762976
{
29772977
type Lower = [T::Lower; N];
29782978

2979-
const ABI: CanonicalAbiInfo = CanonicalAbiInfo::fixed_size_list_static(&T::ABI, N as u32);
2979+
const ABI: CanonicalAbiInfo = CanonicalAbiInfo::fixed_length_list_static(&T::ABI, N as u32);
29802980

29812981
fn typecheck(ty: &InterfaceType, types: &InstanceType<'_>) -> Result<()> {
29822982
match ty {
2983-
InterfaceType::FixedSizeList(t) => T::typecheck(&types.types[*t].element, types),
2983+
InterfaceType::FixedLengthList(t) => T::typecheck(&types.types[*t].element, types),
29842984
other => bail!("expected `list<_, N>` found `{}`", desc(other)),
29852985
}
29862986
}
@@ -2997,7 +2997,7 @@ where
29972997
dst: &mut MaybeUninit<Self::Lower>,
29982998
) -> Result<()> {
29992999
let element = match ty {
3000-
InterfaceType::FixedSizeList(ty) => cx.types[ty].element,
3000+
InterfaceType::FixedLengthList(ty) => cx.types[ty].element,
30013001
_ => bad_type_info(),
30023002
};
30033003
for (i, val) in self.iter().enumerate() {
@@ -3014,7 +3014,7 @@ where
30143014
) -> Result<()> {
30153015
debug_assert!(offset % (Self::ALIGN32 as usize) == 0);
30163016
let element = match ty {
3017-
InterfaceType::FixedSizeList(ty) => cx.types[ty].element,
3017+
InterfaceType::FixedLengthList(ty) => cx.types[ty].element,
30183018
_ => bad_type_info(),
30193019
};
30203020
for (i, val) in self.iter().enumerate() {
@@ -3034,7 +3034,7 @@ where
30343034
src: &Self::Lower,
30353035
) -> Result<Self> {
30363036
let element = match ty {
3037-
InterfaceType::FixedSizeList(ty) => cx.types[ty].element,
3037+
InterfaceType::FixedLengthList(ty) => cx.types[ty].element,
30383038
_ => bad_type_info(),
30393039
};
30403040
// this is reimplementation of array::try_from_fn
@@ -3073,7 +3073,7 @@ where
30733073
) -> Result<Self> {
30743074
debug_assert!((bytes.as_ptr() as usize) % (Self::ALIGN32 as usize) == 0);
30753075
let element = match ty {
3076-
InterfaceType::FixedSizeList(ty) => cx.types[ty].element,
3076+
InterfaceType::FixedLengthList(ty) => cx.types[ty].element,
30773077
_ => bad_type_info(),
30783078
};
30793079
// this is reimplementation of array::try_from_fn

‎crates/wasmtime/src/runtime/component/types.rs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ use core::ops::Deref;
1010
use wasmtime_environ::PanicOnOom as _;
1111
use wasmtime_environ::component::{
1212
ComponentTypes, Export, InterfaceType, ResourceIndex, TypeComponentIndex,
13-
TypeComponentInstanceIndex, TypeDef, TypeEnumIndex, TypeFixedSizeListIndex, TypeFlagsIndex,
13+
TypeComponentInstanceIndex, TypeDef, TypeEnumIndex, TypeFixedLengthListIndex, TypeFlagsIndex,
1414
TypeFuncIndex, TypeFutureIndex, TypeFutureTableIndex, TypeListIndex, TypeMapIndex,
1515
TypeModuleIndex, TypeOptionIndex, TypeRecordIndex, TypeResourceTable, TypeResourceTableIndex,
1616
TypeResultIndex, TypeStreamIndex, TypeStreamTableIndex, TypeTupleIndex, TypeVariantIndex,
@@ -166,10 +166,10 @@ impl TypeChecker<'_> {
166166
(InterfaceType::Stream(_), _) => false,
167167
(InterfaceType::ErrorContext(_), InterfaceType::ErrorContext(_)) => true,
168168
(InterfaceType::ErrorContext(_), _) => false,
169-
(InterfaceType::FixedLengthList(t1), InterfaceType::FixedSizeList(t2)) => {
169+
(InterfaceType::FixedLengthList(t1), InterfaceType::FixedLengthList(t2)) => {
170170
self.fixed_length_lists_equal(t1, t2)
171171
}
172-
(InterfaceType::FixedSizeList(_), _) => false,
172+
(InterfaceType::FixedLengthList(_), _) => false,
173173
}
174174
}
175175

@@ -389,7 +389,7 @@ pub struct FixedLengthList(Handle<TypeFixedLengthListIndex>);
389389
impl PartialEq for FixedLengthList {
390390
fn eq(&self, other: &Self) -> bool {
391391
self.0
392-
.equivalent(&other.0, TypeChecker::fixed_size_lists_equal)
392+
.equivalent(&other.0, TypeChecker::fixed_length_lists_equal)
393393
}
394394
}
395395

@@ -783,7 +783,7 @@ pub enum Type {
783783
Future(FutureType),
784784
Stream(StreamType),
785785
ErrorContext,
786-
FixedSizeList(FixedSizeList),
786+
FixedLengthList(FixedLengthList),
787787
}
788788

789789
impl Type {
@@ -946,7 +946,7 @@ impl Type {
946946
InterfaceType::Stream(index) => Type::Stream(instance.stream_type(*index)),
947947
InterfaceType::ErrorContext(_) => Type::ErrorContext,
948948
InterfaceType::FixedLengthList(index) => {
949-
Type::FixedLengthList(FixedSizeList::from(*index, instance))
949+
Type::FixedLengthList(FixedLengthList::from(*index, instance))
950950
}
951951
}
952952
}
@@ -980,7 +980,7 @@ impl Type {
980980
Type::Future(_) => "future",
981981
Type::Stream(_) => "stream",
982982
Type::ErrorContext => "error-context",
983-
Type::FixedSizeList(_) => "list<_, N>",
983+
Type::FixedLengthList(_) => "list<_, N>",
984984
}
985985
}
986986
}

‎crates/wasmtime/src/runtime/component/values.rs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ pub enum Val {
9393
Future(FutureAny),
9494
Stream(StreamAny),
9595
ErrorContext(ErrorContextAny),
96-
FixedSizeList(Vec<Val>),
96+
FixedLengthList(Vec<Val>),
9797
}
9898

9999
impl Val {
@@ -526,7 +526,7 @@ impl Val {
526526
)
527527
}
528528
(InterfaceType::ErrorContext(_), _) => unexpected(ty, self),
529-
(InterfaceType::FixedLengthList(ty), Val::FixedSizeList(values)) => {
529+
(InterfaceType::FixedLengthList(ty), Val::FixedLengthList(values)) => {
530530
let ty = &cx.types[ty];
531531
if ty.size as usize != values.len() {
532532
bail!("expected vec of size {}, got {}", ty.size, values.len());
@@ -536,7 +536,7 @@ impl Val {
536536
}
537537
Ok(())
538538
}
539-
(InterfaceType::FixedSizeList(_), _) => unexpected(ty, self),
539+
(InterfaceType::FixedLengthList(_), _) => unexpected(ty, self),
540540
}
541541
}
542542

@@ -699,7 +699,7 @@ impl Val {
699699
)
700700
}
701701
(InterfaceType::ErrorContext(_), _) => unexpected(ty, self),
702-
(InterfaceType::FixedLengthList(ty), Val::FixedSizeList(values)) => {
702+
(InterfaceType::FixedLengthList(ty), Val::FixedLengthList(values)) => {
703703
let ty = &cx.types[ty];
704704
if ty.size as usize != values.len() {
705705
bail!("expected {} types, got {}", ty.size, values.len());
@@ -710,7 +710,7 @@ impl Val {
710710
}
711711
Ok(())
712712
}
713-
(InterfaceType::FixedSizeList(_), _) => unexpected(ty, self),
713+
(InterfaceType::FixedLengthList(_), _) => unexpected(ty, self),
714714
}
715715
}
716716

@@ -742,7 +742,7 @@ impl Val {
742742
Val::Future(_) => "future",
743743
Val::Stream(_) => "stream",
744744
Val::ErrorContext(_) => "error-context",
745-
Val::FixedSizeList(_) => "list<_, N>",
745+
Val::FixedLengthList(_) => "list<_, N>",
746746
}
747747
}
748748

@@ -829,8 +829,8 @@ impl PartialEq for Val {
829829
(Self::Stream(_), _) => false,
830830
(Self::ErrorContext(l), Self::ErrorContext(r)) => l == r,
831831
(Self::ErrorContext(_), _) => false,
832-
(Self::FixedSizeList(l), Self::FixedSizeList(r)) => l == r,
833-
(Self::FixedSizeList(_), _) => false,
832+
(Self::FixedLengthList(l), Self::FixedLengthList(r)) => l == r,
833+
(Self::FixedLengthList(_), _) => false,
834834
}
835835
}
836836
}

‎crates/wasmtime/src/runtime/wave/component.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ impl WasmType for component::Type {
4040
Self::Option(_) => WasmTypeKind::Option,
4141
Self::Result(_) => WasmTypeKind::Result,
4242
Self::Flags(_) => WasmTypeKind::Flags,
43-
Self::FixedSizeList(_) => WasmTypeKind::FixedSizeList,
43+
Self::FixedLengthList(_) => WasmTypeKind::FixedLengthList,
4444

4545
Self::Own(_)
4646
| Self::Borrow(_)

‎crates/wit-bindgen/src/lib.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1975,7 +1975,7 @@ impl<'a> InterfaceGenerator<'a> {
19751975
}
19761976
}
19771977

1978-
fn type_fixed_size_list(
1978+
fn type_fixed_length_list(
19791979
&mut self,
19801980
id: TypeId,
19811981
_name: &str,

‎crates/wit-bindgen/src/types.rs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,10 +167,9 @@ impl Types {
167167
TypeDefKind::Handle(_) => info.has_handle = true,
168168
TypeDefKind::Resource => {}
169169
TypeDefKind::Unknown => unreachable!(),
170-
TypeDefKind::FixedSizeList(ty, _) => {
170+
TypeDefKind::FixedLengthList(ty, _) => {
171171
info = self.type_info(resolve, ty);
172172
}
173-
TypeDefKind::Map(..) => todo!(),
174173
}
175174
self.type_info.insert(ty, info);
176175
info

0 commit comments

Comments
 (0)