cargo fmt

This commit is contained in:
collin 2022-05-10 16:35:53 -07:00
parent 60f6b77629
commit 455603f0a4
2 changed files with 6 additions and 9 deletions

View File

@ -89,9 +89,7 @@ impl Node for ValueExpression {
| Field(_, span)
| Integer(_, _, span)
| Scalar(_, span)
| String(_, span) => {
*span = new_span
}
| String(_, span) => *span = new_span,
Char(character) => character.span = new_span,
Group(group) => match &mut **group {
GroupValue::Single(_, span) => *span = new_span,

View File

@ -155,11 +155,11 @@ impl<'a> TypeChecker<'a> {
return_incorrect_type(t1, t2, expected)
}
BinaryOperation::Add => {
self.assert_field_group_scalar_int_type(expected.clone(), binary.span());
let t1 = self.compare_expr_type(&binary.left, expected.clone(), binary.left.span());
let t2 = self.compare_expr_type(&binary.right, expected.clone(), binary.right.span());
self.assert_field_group_scalar_int_type(expected.clone(), binary.span());
let t1 = self.compare_expr_type(&binary.left, expected.clone(), binary.left.span());
let t2 = self.compare_expr_type(&binary.right, expected.clone(), binary.right.span());
return_incorrect_type(t1, t2, expected)
return_incorrect_type(t1, t2, expected)
}
BinaryOperation::Sub => {
self.assert_field_group_int_type(expected.clone(), binary.span());
@ -176,8 +176,7 @@ impl<'a> TypeChecker<'a> {
// Allow `group` * `scalar` multiplication.
match (t1.as_ref(), t2.as_ref()) {
(Some(Type::Group), Some(Type::Scalar))
| (Some(Type::Scalar), Some(Type::Group)) => {
(Some(Type::Group), Some(Type::Scalar)) | (Some(Type::Scalar), Some(Type::Group)) => {
Some(Type::Group)
}
_ => return_incorrect_type(t1, t2, expected),