language-servers/slint
1
0
Fork 0
mirror of https://github.com/slint-ui/slint.git synced 2025-07-24 13:35:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix conversions of array literal containing struct with array literal

Browse source 
Fixes #2023
This commit is contained in:
Olivier Goffart 2022-12-28 11:12:22 +01:00 • committed by Olivier Goffart
parent 8edc7f669a
commit 8d7b8df922
3 changed files with 22 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
internal/compiler/expression_tree.rs
View file

@ -1075,15 +1075,17 @@ impl Expression {
},
};
Expression::Cast { from: Box::new(from), to: target_type }
} else if matches!((&ty, &target_type, &self), (Type::Array(left), Type::Array(right), Expression::Array{..})
if left.can_convert(right) || **left == Type::Invalid)
{
} else if matches!(
(&ty, &target_type, &self),
(Type::Array(_), Type::Array(_), Expression::Array { .. })
) {
// Special case for converting array literals
match (self, target_type) {
(Expression::Array { values, .. }, Type::Array(target_type)) => Expression::Array {
values: values
.into_iter()
.map(|e| e.maybe_convert_to((*target_type).clone(), node, diag))
.take_while(|e| !matches!(e, Expression::Invalid))
.collect(),
element_ty: *target_type,
},