---

yaml
---
r: 5847
b: refs/heads/master
c: 314c011
h: refs/heads/master
i:
  5845: d1935d3
  5843: 8a11c3c
  5839: a2edb16
v: v3

Author: brson

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 71a4a661359dbe92493f7321f8b3677dec734df9
+refs/heads/master: 314c011d71c699291361870e13892b4e5867d046

trunk/src/comp/middle/ty.rs

@@ -1947,9 +1947,16 @@ mod unify {
                  variance: variance) ->
        option::t<(ast::mutability, variance)> {
 
-        // If you're unifying mutability then the thing inside
-        // will be invariant on anything it contains
-        let newvariance = variance_transform(variance, invariant);
+        // If you're unifying on something mutable then we have to
+        // be invariant on the inner type
+        let newvariance = alt expected {
+          ast::mut. {
+            variance_transform(variance, invariant)
+          }
+          _ {
+            variance_transform(variance, covariant)
+          }
+        };
 
         if expected == actual { ret some((expected, newvariance)); }
         if variance == covariant {

trunk/src/test/run-pass/mutable-huh-variance-vec1.rs

@@ -0,0 +1,13 @@
+// error-pattern: mismatched types
+
+fn main() {
+    let v = [[0]];
+
+    // This is ok because the outer vec is covariant with respect
+    // to the inner vec. If the outer vec was mutable then we
+    // couldn't do this.
+    fn f(&&v: [[mutable? int]]) {
+    }
+
+    f(v);
+}

trunk/src/test/run-pass/mutable-huh-variance-vec2.rs

@@ -0,0 +1,13 @@
+// error-pattern: mismatched types
+
+fn main() {
+    let v = [[0]];
+
+    // This is ok because the outer vec is covariant with respect
+    // to the inner vec. If the outer vec was mutable then we
+    // couldn't do this.
+    fn f(&&v: [mutable? [mutable? int]]) {
+    }
+
+    f(v);
+}