Skip to content

Commit b1fdde1

Browse files
committed
---
yaml --- r: 5443 b: refs/heads/master c: f6ab12a h: refs/heads/master i: 5441: 82ab2c1 5439: c01ddda v: v3
1 parent c0bfb46 commit b1fdde1

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
---
2-
refs/heads/master: 5ab084035330f97aaf315d5001a4393793fa017b
2+
refs/heads/master: f6ab12a3b175f5c4837334a96a602a91c5935c84

trunk/src/comp/middle/ty.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2195,11 +2195,10 @@ mod unify {
21952195
alt struct(cx.tcx, actual) {
21962196
ty::ty_uniq(actual_mt) {
21972197
let mut = expected_mt.mut;
2198-
// FIXME (409) Write a test then uncomment
2199-
/*alt unify_mut(expected_mt.mut, actual_mt.mut) {
2198+
alt unify_mut(expected_mt.mut, actual_mt.mut) {
22002199
none. { ret ures_err(terr_box_mutability); }
22012200
some(m) { mut = m; }
2202-
}*/
2201+
}
22032202
let result = unify_step(cx, expected_mt.ty, actual_mt.ty);
22042203
alt result {
22052204
ures_ok(result_mt) {
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
//error-pattern:mismatched types
2+
fn main() {
3+
let i: ~int = ~mutable 0;
4+
}

0 commit comments

Comments
 (0)