language-servers/slint
1
0
Fork 0
mirror of https://github.com/slint-ui/slint.git synced 2025-08-04 18:58:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix conversion of struct with array of literals (#1109)

Browse source 
Fixes #944
This commit is contained in:
Olivier Goffart 2022-03-28 14:41:11 +02:00 • committed by GitHub
parent 3a9fe1d161
commit 6622f33327
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

18
internal/compiler/expression_tree.rs
View file

@ -993,6 +993,24 @@ impl Expression {
},
_ => unreachable!(),
}
} else if let (Type::Struct { fields, .. }, Expression::Struct { values, .. }) =
(&target_type, &self)
{
// Also special case struct literal in case they contain array literal
let mut fields = fields.clone();
let mut new_values = HashMap::new();
for (f, v) in values {
if let Some(t) = fields.remove(f) {
new_values.insert(f.clone(), v.clone().maybe_convert_to(t, node, diag));
} else {
diag.push_error(format!("Cannot convert {} to {}", ty, target_type), node);
return self;
}
}
for (f, t) in fields {
new_values.insert(f, Expression::default_value_for_type(&t));
}
Expression::Struct { ty: target_type, values: new_values }
} else {
let mut message = format!("Cannot convert {} to {}", ty, target_type);
// Explicit error message for unit conversion