Skip to content

Commit ce85ed1

Browse files
committed
---
yaml --- r: 979 b: refs/heads/master c: 9c42652 h: refs/heads/master i: 977: 02ccf5b 975: 1d4c498 v: v3
1 parent 57f4d54 commit ce85ed1

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

[refs]

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
---
2-
refs/heads/master: a94046f5d2d22389113c8954e87d63e29f9b6625
2+
refs/heads/master: 9c426521ee63390a94a2f7660a0dd61c5e978540

trunk/src/comp/middle/typeck.rs

+5-3
Original file line numberDiff line numberDiff line change
@@ -793,7 +793,8 @@ fn unify(&fn_ctxt fcx, @ty expected, @ty actual) -> unify_result {
793793
while (i < expected_len) {
794794
auto expected_field = expected_fields.(i);
795795
auto actual_field = actual_fields.(i);
796-
if (expected_field.ty.mut != actual_field.ty.mut) {
796+
if (expected_field.ty.mut
797+
!= actual_field.ty.mut) {
797798
auto err = terr_record_mutability;
798799
ret ures_err(err, expected, actual);
799800
}
@@ -812,8 +813,9 @@ fn unify(&fn_ctxt fcx, @ty expected, @ty actual) -> unify_result {
812813
actual_field.ty);
813814
alt (result) {
814815
case (ures_ok(?rty)) {
815-
append[field](result_fields,
816-
rec(ty=rty with expected_field));
816+
append[field]
817+
(result_fields,
818+
rec(ty=rty with expected_field));
817819
}
818820
case (_) {
819821
ret result;

0 commit comments

Comments
 (0)