diff options
| author | Austin Seipp <as@hacks.yi.org> | 2012-01-09 19:15:17 -0600 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2012-01-09 19:27:05 -0800 |
| commit | a94b1ccacbc2869b6a67afcda98d7495c0086eb3 (patch) | |
| tree | 46c25968d972b54ef5acb86a7c18ed1bcf541f3e /src/comp/middle/ty.rs | |
| parent | aeae04cb49a3af321e75f839d409768014bd5169 (diff) | |
| download | rust-a94b1ccacbc2869b6a67afcda98d7495c0086eb3.tar.gz rust-a94b1ccacbc2869b6a67afcda98d7495c0086eb3.zip | |
Change all uses of 'when' in alt-patterns to 'if'
Issue #1396
Diffstat (limited to 'src/comp/middle/ty.rs')
| -rw-r--r-- | src/comp/middle/ty.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/comp/middle/ty.rs b/src/comp/middle/ty.rs index f1a1858267a..e0c6d6f4ba2 100644 --- a/src/comp/middle/ty.rs +++ b/src/comp/middle/ty.rs @@ -1953,9 +1953,9 @@ mod unify { } ret alt variance { - invariant. when e_proto == a_proto { none } - covariant. when sub_proto(a_proto, e_proto) { none } - contravariant. when sub_proto(e_proto, a_proto) { none } + invariant. if e_proto == a_proto { none } + covariant. if sub_proto(a_proto, e_proto) { none } + contravariant. if sub_proto(e_proto, a_proto) { none } _ { some(ures_err(terr_mismatch)) } }; } @@ -2220,7 +2220,7 @@ mod unify { } ty::ty_param(expected_n, _) { alt struct(cx.tcx, actual) { - ty::ty_param(actual_n, _) when expected_n == actual_n { + ty::ty_param(actual_n, _) if expected_n == actual_n { ret ures_ok(expected); } _ { ret ures_err(terr_mismatch); } |