Skip to content
This repository has been archived by the owner on Dec 11, 2024. It is now read-only.

Fix unit variant case conversion #62

Merged
merged 1 commit into from
Jul 15, 2024
Merged

Fix unit variant case conversion #62

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 29 additions & 19 deletions wasm-rpc/src/wasmtime.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,25 +166,35 @@ pub fn decode_param(
details: format!("could not get case for discriminant {}", case_idx),
})?;
let name = case.name;
let case_ty = match case.ty {
Some(ref ty) => Ok(ty),
None => Err(EncodingError::ValueMismatch {
details: format!("could not get type information for case {}", name),
}),
}?;
let decoded_value = case_value
.as_ref()
.map(|v| decode_param(v, case_ty, resource_store))
.transpose()?;
match decoded_value {
Some(decoded_value) => Ok(DecodeParamResult {
val: Val::Variant(name.to_string(), Some(Box::new(decoded_value.val))),
resources_to_drop: decoded_value.resources_to_drop,
}),
None => Ok(DecodeParamResult::simple(Val::Variant(
name.to_string(),
None,
))),
match case.ty {
Some(ref case_ty) => {
let decoded_value = case_value
.as_ref()
.map(|v| decode_param(v, case_ty, resource_store))
.transpose()?;
match decoded_value {
Some(decoded_value) => Ok(DecodeParamResult {
val: Val::Variant(
name.to_string(),
Some(Box::new(decoded_value.val)),
),
resources_to_drop: decoded_value.resources_to_drop,
}),
None => Ok(DecodeParamResult::simple(Val::Variant(
name.to_string(),
None,
))),
}
}
None => match case_value {
Some(_) => Err(EncodingError::ValueMismatch {
details: "expected no value for unit variant".to_string(),
}),
None => Ok(DecodeParamResult::simple(Val::Variant(
name.to_string(),
None,
))),
},
}
}
_ => Err(EncodingError::ParamTypeMismatch),
Expand Down
Loading