---

yaml
---
r: 29971
b: refs/heads/incoming
c: b5411f7
h: refs/heads/master
i:
  29969: e677ac3
  29967: e0bd85d
v: v3

Author: nikomatsakis

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
-refs/heads/incoming: 9b489f6fff4aa07bea2db9457ece5f77c211e016
+refs/heads/incoming: b5411f765cdac796fc6798e49521c8da89a394cc
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/libcore/managed.rs

@@ -3,7 +3,7 @@
 Module for wrapping freezable data structures in managed boxes.
 Normally freezable data structures require an unaliased reference,
 such as `T` or `~T`, so that the compiler can track when they are
-being mutated.  The `rw<T>` type converts these static checks into
+being mutated.  The `managed<T>` type converts these static checks into
 dynamic checks: your program will fail if you attempt to perform
 mutation when the data structure should be immutable.
 
@@ -21,8 +21,8 @@ export Managed;
 enum Mode { ReadOnly, Mutable, Immutable }
 
 struct Data<T> {
-    mut value: T;
-    mut mode: Mode;
+    priv mut value: T;
+    priv mut mode: Mode;
 }
 
 type Managed<T> = @Data<T>;
@@ -60,3 +60,82 @@ impl<T> Data<T> {
         }
     }
 }
+
+#[test]
+#[should_fail]
+fn test_mut_in_imm() {
+    let m = Managed(1);
+    do m.borrow_imm |_p| {
+        do m.borrow_mut |_q| {
+            // should not be permitted
+        }
+    }
+}
+
+#[test]
+#[should_fail]
+fn test_imm_in_mut() {
+    let m = Managed(1);
+    do m.borrow_mut |_p| {
+        do m.borrow_imm |_q| {
+            // should not be permitted
+        }
+    }
+}
+
+#[test]
+fn test_const_in_mut() {
+    let m = Managed(1);
+    do m.borrow_mut |p| {
+        do m.borrow_const |q| {
+            assert *p == *q;
+            *p += 1;
+            assert *p == *q;
+        }
+    }
+}
+
+#[test]
+fn test_mut_in_const() {
+    let m = Managed(1);
+    do m.borrow_const |p| {
+        do m.borrow_mut |q| {
+            assert *p == *q;
+            *q += 1;
+            assert *p == *q;
+        }
+    }
+}
+
+#[test]
+fn test_imm_in_const() {
+    let m = Managed(1);
+    do m.borrow_const |p| {
+        do m.borrow_imm |q| {
+            assert *p == *q;
+        }
+    }
+}
+
+#[test]
+fn test_const_in_imm() {
+    let m = Managed(1);
+    do m.borrow_imm |p| {
+        do m.borrow_const |q| {
+            assert *p == *q;
+        }
+    }
+}
+
+
+#[test]
+#[should_fail]
+fn test_mut_in_imm_in_const() {
+    let m = Managed(1);
+    do m.borrow_const |_p| {
+        do m.borrow_imm |_q| {
+            do m.borrow_mut |_r| {
+            }
+        }
+    }
+}